l10n daemon script c735bf3bcf 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"		2020-09-20 05:52:17 +02:00
..
package	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-09-20 05:52:17 +02: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	delay the first active window sync	2020-07-30 15:29:57 +02:00
taskpanel.h	fixes to task switcher experience	2020-07-23 13:47:40 +02:00