l10n daemon script ab190aa5da SVN_SILENT made messages (.desktop file) - always resolve ours ... In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"		2019-12-28 05:25:20 +01:00
..
package	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-12-28 05:25:20 +01:00
CMakeLists.txt	reintroduce c++ plugin	2016-08-24 16:57:15 +02:00
Messages.sh	new bottom panel containment with close button	2015-06-11 15:35:46 -07:00
taskpanel.cpp	Port remaining old-style connects	2019-11-29 09:33:00 +00:00
taskpanel.h	Modernize using clang-tidy	2018-12-31 04:13:55 +01:00