yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
kwin/kcmkwin
History
l10n daemon script b4c8fa64b8 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-04-28 13:46:57 +00:00
..
kwincompositing SVN_SILENT made messages (.desktop file) - always resolve ours 2015-04-28 13:46:57 +00:00
kwindecoration SVN_SILENT made messages (.desktop file) - always resolve ours 2015-04-07 13:20:00 +00:00
kwindesktop SVN_SILENT made messages (.desktop file) - always resolve ours 2015-04-24 09:53:59 +00:00
kwinoptions SVN_SILENT made messages (.desktop file) - always resolve ours 2015-04-07 13:20:00 +00:00
kwinrules [kcmkwin/rules] Fix kdeinit_kwin_rules_dialog crashing on start 2015-04-23 09:36:31 +02:00
kwinscreenedges SVN_SILENT made messages (.desktop file) - always resolve ours 2015-04-07 13:20:00 +00:00
kwinscripts Fix installation of GHNS material 2015-03-13 15:51:20 +01:00
kwintabbox SVN_SILENT made messages (.desktop file) - always resolve ours 2015-04-07 13:20:00 +00:00
CMakeLists.txt