l10n daemon script 7d3d68a3c8 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"		2017-01-16 06:06:25 +01:00
..
declarativeimports	Q_ENUMS -> Q_ENUM and Q_FLAGS -> Q_FLAG	2017-01-14 01:06:28 +01:00
desktoptheme	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-01-16 06:06:25 +01:00
plasma	Q_ENUMS -> Q_ENUM and Q_FLAGS -> Q_FLAG	2017-01-14 01:06:28 +01:00
plasmapkg	search/replace old hardcoded types from plasmapkg2	2017-01-03 13:25:02 +01:00
plasmaquick	Q_ENUMS -> Q_ENUM and Q_FLAGS -> Q_FLAG	2017-01-14 01:06:28 +01:00
scriptengines	Fix X-Plasma-Drop* types	2017-01-03 09:31:21 +01:00
tools	fix stylesheet	2015-12-07 10:40:34 +01:00
CMakeLists.txt	remove kpart related code	2016-05-19 17:47:09 +02:00
Messages.sh	Consolidate all plasma-framework catalogs	2014-04-25 10:40:12 +02:00