diff options
| author | Bor Kraljič | 2010-10-31 13:48:24 +0100 |
|---|---|---|
| committer | Bor Kraljič | 2010-10-31 13:48:24 +0100 |
| commit | 0bef0da930429cd596ddf986c15d4c7eca8564f4 (patch) | |
| tree | e72bb9e4183df3825e4673ce257230676b9dbe57 | |
| parent | 346952cc4acb7d2a7e904bbbae5a8f3ec6609f6e (diff) | |
msynctool: conflicts added multisync & multisync (deprecated)
| -rwxr-xr-x | mobile/msynctool/CONFLICTS | 2 | ||||
| -rw-r--r-- | mobile/msynctool/HISTORY | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/mobile/msynctool/CONFLICTS b/mobile/msynctool/CONFLICTS new file mode 100755 index 0000000000..4a8993336d --- /dev/null +++ b/mobile/msynctool/CONFLICTS @@ -0,0 +1,2 @@ +conflicts multisync y +conflicts multisync-gui y diff --git a/mobile/msynctool/HISTORY b/mobile/msynctool/HISTORY index 1953137106..aa47638666 100644 --- a/mobile/msynctool/HISTORY +++ b/mobile/msynctool/HISTORY @@ -1,3 +1,6 @@ +2010-10-31 Bor Kraljič <pyrobor@ver.si> + * CONFLICTS: added multisync & multisync (deprecated) + 2010-10-21 Bor Kraljič <pyrobor@ver.si> * DETAILS: fixed SOURCE & SOURCE_URL * HISTORY: fixed typo |