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)
16 files changed:
1  2 
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

index a2a9937,0000000..063f07d
mode 100644,000000..100644
--- /dev/null
@@@ -1,3 -1,0 +1,5 @@@
 +.settings
 +.project
 +.buildpath
++/vendor
++/tests/junit_log_syncroton.xml
index 0000000,5c13400..5c13400
mode 000000,100644..100644
--- /dev/null
index 0000000,e43442d..e43442d
mode 000000,100644..100644
--- /dev/null