yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
kwin/kcmkwin
History
l10n daemon script 75f3964db7 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-25 10:45:05 +00:00
..
kwincompositing SVN_SILENT made messages (.desktop file) - always resolve ours 2015-10-25 10:45:05 +00:00
kwindecoration Merge branch 'Plasma/5.4' 2015-10-21 08:11:38 +02:00
kwindesktop SVN_SILENT made messages (.desktop file) 2015-10-03 13:19:41 +00:00
kwinoptions SVN_SILENT made messages (.desktop file) - always resolve ours 2015-10-24 10:47:31 +00:00
kwinrules SVN_SILENT made messages (.desktop file) 2015-10-03 13:19:41 +00:00
kwinscreenedges Drop PreventScreenLocking electric border 2015-10-21 08:14:50 +02:00
kwinscripts SVN_SILENT made messages (.desktop file) 2015-10-03 13:19:41 +00:00
kwintabbox SVN_SILENT made messages (.desktop file) 2015-10-03 13:19:41 +00:00
CMakeLists.txt Drop build option KWIN_BUILD_SCREENEDGES 2014-11-24 10:48:49 +01:00