Christian Kamm 53d5de685c Merge remote-tracking branch 'origin/1.7' ... Conflicts: src/gui/folder.cpp src/gui/folder.h src/libsync/networkjobs.cpp src/libsync/owncloudpropagator.h src/libsync/propagatedownload.cpp		2014-12-10 13:01:36 +01:00
..
dolphin	Import the dolphin plugin	2014-11-24 15:06:08 +01:00
icons	cmake: Fix installation of overlay icons on linux	2014-09-29 16:08:49 +02:00
MacOSX	Mirall -> (Desktop) Client	2014-12-08 17:54:32 +01:00
nautilus	Nautilus shell integration: Use fallback when XDG_RUNTIME_DIR is not defined	2014-12-01 12:06:09 +01:00
testclient	Add a few Q_DECL_OVERRIDE	2014-11-08 11:21:48 +01:00
windows/OCShellExtensions	Merge remote-tracking branch 'origin/1.7'	2014-12-10 13:01:36 +01:00
CMakeLists.txt	CMake: Install the nautilus plugin.	2014-08-04 18:58:35 +02:00