l10n daemon script c0f1b1ebb4 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-10-17 12:43:21 +00:00
..
CMakeLists.txt	Port from KServiceTypeTrader, etc. to new json style plugins.	2015-09-16 20:55:30 -06:00
krfb_framebuffer_x11.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-05-25 04:27:43 +00:00
krfb_framebuffer_x11.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-10-17 12:43:21 +00:00
x11framebuffer.cpp	Port away from KLocale and kdemacros	2015-09-11 13:01:02 -06:00
x11framebuffer.h	virtual -> override	2015-10-10 13:27:49 +02:00
x11framebufferplugin.cpp	Port from KServiceTypeTrader, etc. to new json style plugins.	2015-09-16 20:55:30 -06:00
x11framebufferplugin.h	virtual -> override	2015-10-10 13:27:49 +02:00