l10n daemon script a360e5c8ae 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-07-31 05:17:18 +02:00
..
CMakeLists.txt	Port from KServiceTypeTrader, etc. to new json style plugins.	2015-09-16 20:55:30 -06:00
krfb_framebuffer_qt.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-07-31 05:17:18 +02:00
qtframebuffer.cpp	Fix warning when compiling with Qt >= 5.10	2019-05-18 02:05:16 +03:00
qtframebuffer.h	Consistently use override	2018-07-17 14:40:23 +02:00
qtframebufferplugin.cpp	Port from KServiceTypeTrader, etc. to new json style plugins.	2015-09-16 20:55:30 -06:00
qtframebufferplugin.h	Consistently use override	2018-07-17 14:40:23 +02:00