l10n daemon script 29f9449fda 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"		2015-11-29 08:59:07 +00:00
..
dialogs	revert to old margins	2015-11-10 10:54:02 +01:00
icons	red at 10%	2015-11-25 12:49:23 +01:00
opaque	complete dialogs	2015-10-19 18:59:36 +02:00
translucent	revert to old margins	2015-11-10 10:54:02 +01:00
widgets	fix stylesheet	2015-11-23 11:24:09 +01:00
.gitignore	Removed .directory and added gitignore	2015-11-16 19:46:00 -06:00
CMakeLists.txt	Revert "proper icons in drawers"	2014-08-20 12:14:19 +02:00
colors	new color group of "complementary" colors	2014-06-18 19:02:08 +02:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-11-29 08:59:07 +00:00