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
..
qt	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-10-17 12:43:21 +00:00
x11	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-10-17 12:43:21 +00:00
CMakeLists.txt	Framebuffers are now plugins. This means we can switch between the Qt and X11 framebuffers at runtime.	2009-09-23 20:57:47 +00:00