Merge branch 'master' of http://git.tine20.org/git/Syncope
authorLars Kneschke <l.kneschke@metaways.de>
Fri, 3 Feb 2012 13:06:59 +0000 (14:06 +0100)
committerLars Kneschke <l.kneschke@metaways.de>
Fri, 3 Feb 2012 13:06:59 +0000 (14:06 +0100)
ae34151f34537ccf99

Conflicts:
tine20/ActiveSync/Server/Http.php

78 files changed:
1  2 
tine20/library/Syncope/lib/Syncope/Backend/Content.php
tine20/library/Syncope/lib/Syncope/Backend/Device.php
tine20/library/Syncope/lib/Syncope/Backend/Folder.php
tine20/library/Syncope/lib/Syncope/Backend/IContent.php
tine20/library/Syncope/lib/Syncope/Backend/IDevice.php
tine20/library/Syncope/lib/Syncope/Backend/IFolder.php
tine20/library/Syncope/lib/Syncope/Backend/ISyncState.php
tine20/library/Syncope/lib/Syncope/Backend/SyncState.php
tine20/library/Syncope/lib/Syncope/Command/FolderCreate.php
tine20/library/Syncope/lib/Syncope/Command/FolderDelete.php
tine20/library/Syncope/lib/Syncope/Command/FolderSync.php
tine20/library/Syncope/lib/Syncope/Command/FolderUpdate.php
tine20/library/Syncope/lib/Syncope/Command/GetAttachment.php
tine20/library/Syncope/lib/Syncope/Command/GetItemEstimate.php
tine20/library/Syncope/lib/Syncope/Command/Interface.php
tine20/library/Syncope/lib/Syncope/Command/ItemOperations.php
tine20/library/Syncope/lib/Syncope/Command/MoveItems.php
tine20/library/Syncope/lib/Syncope/Command/Options.php
tine20/library/Syncope/lib/Syncope/Command/Ping.php
tine20/library/Syncope/lib/Syncope/Command/Provision.php
tine20/library/Syncope/lib/Syncope/Command/Search.php
tine20/library/Syncope/lib/Syncope/Command/SendMail.php
tine20/library/Syncope/lib/Syncope/Command/Settings.php
tine20/library/Syncope/lib/Syncope/Command/SmartForward.php
tine20/library/Syncope/lib/Syncope/Command/SmartReply.php
tine20/library/Syncope/lib/Syncope/Command/Sync.php
tine20/library/Syncope/lib/Syncope/Command/Wbxml.php
tine20/library/Syncope/lib/Syncope/Data/AData.php
tine20/library/Syncope/lib/Syncope/Data/Calendar.php
tine20/library/Syncope/lib/Syncope/Data/Contacts.php
tine20/library/Syncope/lib/Syncope/Data/Email.php
tine20/library/Syncope/lib/Syncope/Data/Factory.php
tine20/library/Syncope/lib/Syncope/Data/IData.php
tine20/library/Syncope/lib/Syncope/Data/Tasks.php
tine20/library/Syncope/lib/Syncope/Exception/NotFound.php
tine20/library/Syncope/lib/Syncope/Model/Content.php
tine20/library/Syncope/lib/Syncope/Model/Device.php
tine20/library/Syncope/lib/Syncope/Model/Folder.php
tine20/library/Syncope/lib/Syncope/Model/IContent.php
tine20/library/Syncope/lib/Syncope/Model/IDevice.php
tine20/library/Syncope/lib/Syncope/Model/IFolder.php
tine20/library/Syncope/lib/Syncope/Model/ISyncState.php
tine20/library/Syncope/lib/Syncope/Model/SyncState.php
tine20/library/Syncope/lib/Wbxml/Abstract.php
tine20/library/Syncope/lib/Wbxml/Decoder.php
tine20/library/Syncope/lib/Wbxml/Dtd/ActiveSync.php
tine20/library/Syncope/lib/Wbxml/Dtd/ActiveSync/Abstract.php
tine20/library/Syncope/lib/Wbxml/Dtd/ActiveSync/CodePage0.php
tine20/library/Syncope/lib/Wbxml/Dtd/ActiveSync/CodePage1.php
tine20/library/Syncope/lib/Wbxml/Dtd/ActiveSync/CodePage10.php
tine20/library/Syncope/lib/Wbxml/Dtd/ActiveSync/CodePage11.php
tine20/library/Syncope/lib/Wbxml/Dtd/ActiveSync/CodePage12.php
tine20/library/Syncope/lib/Wbxml/Dtd/ActiveSync/CodePage13.php
tine20/library/Syncope/lib/Wbxml/Dtd/ActiveSync/CodePage14.php
tine20/library/Syncope/lib/Wbxml/Dtd/ActiveSync/CodePage15.php
tine20/library/Syncope/lib/Wbxml/Dtd/ActiveSync/CodePage16.php
tine20/library/Syncope/lib/Wbxml/Dtd/ActiveSync/CodePage17.php
tine20/library/Syncope/lib/Wbxml/Dtd/ActiveSync/CodePage18.php
tine20/library/Syncope/lib/Wbxml/Dtd/ActiveSync/CodePage19.php
tine20/library/Syncope/lib/Wbxml/Dtd/ActiveSync/CodePage2.php
tine20/library/Syncope/lib/Wbxml/Dtd/ActiveSync/CodePage20.php
tine20/library/Syncope/lib/Wbxml/Dtd/ActiveSync/CodePage3.php
tine20/library/Syncope/lib/Wbxml/Dtd/ActiveSync/CodePage4.php
tine20/library/Syncope/lib/Wbxml/Dtd/ActiveSync/CodePage5.php
tine20/library/Syncope/lib/Wbxml/Dtd/ActiveSync/CodePage6.php
tine20/library/Syncope/lib/Wbxml/Dtd/ActiveSync/CodePage7.php
tine20/library/Syncope/lib/Wbxml/Dtd/ActiveSync/CodePage8.php
tine20/library/Syncope/lib/Wbxml/Dtd/ActiveSync/CodePage9.php
tine20/library/Syncope/lib/Wbxml/Dtd/Exception/CodePageNotFound.php
tine20/library/Syncope/lib/Wbxml/Dtd/Factory.php
tine20/library/Syncope/lib/Wbxml/Dtd/Syncml.php
tine20/library/Syncope/lib/Wbxml/Dtd/Syncml/Abstract.php
tine20/library/Syncope/lib/Wbxml/Dtd/Syncml/DevInfo11.php
tine20/library/Syncope/lib/Wbxml/Dtd/Syncml/DevInfo12.php
tine20/library/Syncope/lib/Wbxml/Dtd/Syncml/Syncml11.php
tine20/library/Syncope/lib/Wbxml/Dtd/Syncml/Syncml12.php
tine20/library/Syncope/lib/Wbxml/Encoder.php
tine20/library/Syncope/lib/Wbxml/Exception/UnexpectedEndOfFile.php