r3491 get8021QSyncOptions(): also return C-version for a "delete_conflict" case
authorDenis Ovsienko <infrastation@yandex.ru>
Thu, 29 Apr 2010 07:12:29 +0000 (07:12 +0000)
committerDenis Ovsienko <infrastation@yandex.ru>
Thu, 29 Apr 2010 07:12:29 +0000 (07:12 +0000)
commitef0162932c02643596d18ca1649f48074d1fe122
tree647e67bedd2bbce95884896537262deeb30c9cb2
parentd973196a0f681151d0c4a32ba8e67fba24068ac8
r3491 get8021QSyncOptions(): also return C-version for a "delete_conflict" case
renderObject8021QSync(): distinguish ports to be merged from those already in sync,
  show C-version of ports in delete conflict in case it differs from D-version
inc/functions.php
inc/interface.php