yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
kwin/kcmkwin
History
l10n daemon script 17f808db9a 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-03-14 10:20:33 +00:00
..
kwincompositing Merge remote-tracking branch 'origin/Plasma/5.2' 2015-03-13 15:52:24 +01:00
kwindecoration SVN_SILENT made messages (.desktop file) 2015-02-25 11:29:12 +00:00
kwindesktop SVN_SILENT made messages (.desktop file) - always resolve ours 2015-03-14 10:20:33 +00:00
kwinoptions SVN_SILENT made messages (.desktop file) 2015-02-25 11:29:12 +00:00
kwinrules SVN_SILENT made messages (.desktop file) 2015-02-25 11:29:12 +00:00
kwinscreenedges SVN_SILENT made messages (.desktop file) 2015-02-25 11:29:12 +00:00
kwinscripts Fix installation of GHNS material 2015-03-13 15:51:20 +01:00
kwintabbox Merge remote-tracking branch 'origin/Plasma/5.2' 2015-03-13 15:52:24 +01:00
CMakeLists.txt Drop build option KWIN_BUILD_SCREENEDGES 2014-11-24 10:48:49 +01:00