l10n daemon script 71c3f063bb 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"		2019-10-23 09:01:14 +02:00
..
CMakeLists.txt	Undo some recent cmake changes	2019-09-18 13:50:52 +03:00
compositing.cpp	Port away from deprecated qSort function	2019-07-10 00:00:29 +03:00
compositing.h	Use nullptr everywhere	2019-09-19 17:48:21 +03:00
compositing.ui	Drop OpenGL based color correction from KWin	2016-11-22 07:16:51 +01:00
kwincompositing.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-10-23 09:01:14 +02:00
main.cpp	Use nullptr everywhere	2019-09-19 17:48:21 +03:00
Messages.sh	There's no qml folder here anymore	2019-03-19 22:04:39 +01:00