Merge branch 'master' of http://git.syncroton.org/Syncroton into tine20.com/2012...
authorLars Kneschke <l.kneschke@metaways.de>
Mon, 29 Apr 2013 15:14:46 +0000 (17:14 +0200)
committerLars Kneschke <l.kneschke@metaways.de>
Mon, 29 Apr 2013 15:14:46 +0000 (17:14 +0200)
commita0a6ea8b1fd395c20b4fa70ccf0fab33c83b60dd
tree50804716895774201fdc3a6d31ca5de1149164ac
parentefe195676f1b7ca1f62138f76ffaad9eebfc3ead
parentf061229de36774b33bfb93a6966368d130f51988
Merge branch 'master' of git.syncroton.org/Syncroton into tine20.com/2012.10SyncMerge
18 files changed:
tine20/library/Syncroton/composer.json
tine20/library/Syncroton/lib/Syncroton/Backend/SyncState.php
tine20/library/Syncroton/lib/Syncroton/Command/ItemOperations.php
tine20/library/Syncroton/lib/Syncroton/Command/Sync.php
tine20/library/Syncroton/lib/Syncroton/Data/AData.php
tine20/library/Syncroton/lib/Syncroton/Data/IData.php
tine20/library/Syncroton/lib/Syncroton/Model/AXMLEntry.php
tine20/library/Syncroton/lib/Syncroton/Model/Content.php
tine20/library/Syncroton/lib/Syncroton/Model/Event.php
tine20/library/Syncroton/lib/Syncroton/Model/EventException.php
tine20/library/Syncroton/lib/Syncroton/Model/IContent.php
tine20/library/Syncroton/lib/Syncroton/Model/ISyncState.php
tine20/library/Syncroton/lib/Syncroton/Model/SyncState.php
tine20/library/Syncroton/lib/Syncroton/Wbxml/Dtd/ActiveSync/CodePage14.php
tine20/library/Syncroton/lib/Syncroton/Wbxml/Dtd/ActiveSync/CodePage254.php
tine20/library/Syncroton/lib/Syncroton/Wbxml/Dtd/ActiveSync/CodePage9.php
tine20/library/Syncroton/tests/Syncroton/Command/SyncTests.php
tine20/library/Syncroton/tests/Syncroton/Model/EventTests.php