6 commits

Author	SHA1	Message	Date
Martin Gräßlin	9e3fb47259	[decorations/aurorae] Fix typo in Plastik theme	2016-10-29 20:38:42 +02:00
l10n daemon script	1f76c005e9	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-09-24 12:33:32 +00:00
Martin Gräßlin	9355d605a0	Drop specifying the default debug areas ... Summary: Relict from KDebug times. Test Plan: Compiles Reviewers: #kwin Subscribers: kwin Tags: #kwin Differential Revision: https://phabricator.kde.org/D1981	2016-06-28 11:37:22 +02:00
l10n daemon script	0990566c63	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-05-31 11:06:54 +00:00
Martin Gräßlin	8d7d51e4ef	Merge branch 'Plasma/5.6' ... dont_crash_aurorae_destroy_deco.cpp is adjusted to Platform.	2016-05-12 16:43:12 +02:00
Martin Gräßlin	e4c333a372	Move clients/ to plugins/kdecorations/ ... Summary: KWin's plugins are now all in a plugins subdirectory. This is a good argument to also move the window decoration plugins there. The name clients was not really good anyway and makes it difficult for people not familiar with the code base to find it. Having it under plugins is the more expectable location. Reviewers: #plasma Subscribers: plasma-devel Projects: #plasma Differential Revision: https://phabricator.kde.org/D1414	2016-04-15 15:21:03 +02:00