Olivier Goffart 72b9beb79c Merge remote-tracking branch 'origin/2.4' ... Conflicts: shell_integration/nautilus/syncstate.py		2018-01-23 14:08:15 +01:00
..
dolphin	SocketApi: add a way to disable menu entries	2018-01-23 14:02:56 +01:00
icons	fix branded nemo and caja shell integration (#5966)	2017-08-31 13:16:34 +02:00
MacOSX	Use new ECMAddAppIcon macro for application icons.	2018-01-13 13:58:17 +01:00
nautilus	Merge remote-tracking branch 'origin/2.4'	2018-01-23 14:08:15 +01:00
windows	Windows shell extension: port to the new protocol	2018-01-23 14:02:56 +01:00
CMakeLists.txt	Build Explorer extension if building with MSVC	2018-01-13 13:58:17 +01:00