Daniel Molkentin f8b097669a Merge remote-tracking branch 'origin/1.6' ... Conflicts: VERSION.cmake doc/building.rst		2014-06-27 15:34:20 +02:00
..
3rdparty
creds	Merge remote-tracking branch 'origin/1.6'	2014-06-27 15:34:20 +02:00
mirall	Networkjobs: Check if reply body is empty before parsing.	2014-06-24 15:17:33 +02:00
owncloudcmd	Revert "ownCloudcmd: Use Account object and ConnectionValidator."	2014-06-26 10:16:56 +02:00
updater
wizard	Merge remote-tracking branch 'origin/1.6'	2014-06-27 15:34:20 +02:00
CMakeLists.txt
main.cpp