Merge branch '1.0' of http://git.syncroton.org/Syncroton into 2013.03
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 18 Sep 2013 14:11:11 +0000 (16:11 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 18 Sep 2013 14:11:11 +0000 (16:11 +0200)
commit43788dd13c68d1c78fbae52e83505c13f51d6255
tree9af18b93ead035a4a6828ba34fda9f3da6d6bd17
parent17cbb68d598d84a7e5cbeede3e9ba57797a31710
parent23ebb9ce5e3558b0a3681e11316822dc1afb128a
Merge branch '1.0' of git.syncroton.org/Syncroton into 2013.03
16 files changed:
tine20/library/Syncroton/.gitignore
tine20/library/Syncroton/build.xml
tine20/library/Syncroton/composer.json
tine20/library/Syncroton/composer.lock
tine20/library/Syncroton/docs/syncroton.sql
tine20/library/Syncroton/lib/Syncroton/Command/Ping.php
tine20/library/Syncroton/lib/Syncroton/Command/Sync.php
tine20/library/Syncroton/lib/Syncroton/Model/IDevice.php
tine20/library/Syncroton/lib/Syncroton/Server.php
tine20/library/Syncroton/lib/Syncroton/Wbxml/Abstract.php
tine20/library/Syncroton/lib/Syncroton/Wbxml/Decoder.php
tine20/library/Syncroton/lib/Syncroton/Wbxml/Dtd/ActiveSync/CodePage0.php
tine20/library/Syncroton/lib/Syncroton/Wbxml/Encoder.php
tine20/library/Syncroton/tests/Syncroton/ServerTests.php
tine20/library/Syncroton/tests/bootstrap.php
tine20/library/Syncroton/tests/phpunit.xml