l10n daemon script 57fbaa0597 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"		2016-02-19 09:24:58 +00:00
..
air	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-02-06 09:49:14 +00:00
breeze	default theme follows color scheme	2016-02-17 12:08:31 +01:00
breeze-dark	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-02-02 10:51:53 +00:00
breeze-light	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-02-19 09:24:58 +00:00
oxygen	fix tasks spacing, new tabs	2016-02-02 21:12:05 +01:00
CMakeLists.txt	default theme follows color scheme	2016-02-17 12:08:31 +01:00