Olivier Goffart 72b9beb79c Merge remote-tracking branch 'origin/2.4' ... Conflicts: shell_integration/nautilus/syncstate.py		2018-01-23 14:08:15 +01:00
..
CMakeLists.txt	fix branded nemo and caja shell integration (#5966)	2017-08-31 13:16:34 +02:00
createcajaplugin.sh	fix branded nemo and caja shell integration (#5966)	2017-08-31 13:16:34 +02:00
createnemoplugin.sh	fix branded nemo and caja shell integration (#5966)	2017-08-31 13:16:34 +02:00
setappname.sh	Linux shell integration: Do not call sed from absolute path.	2016-02-09 13:01:03 +01:00
syncstate.py	Merge remote-tracking branch 'origin/2.4'	2018-01-23 14:08:15 +01:00