yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
kwin/kcmkwin/kwinscripts
History
l10n daemon script a4d401c028 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"
2017-06-25 04:33:13 +02:00
..
CMakeLists.txt Port Plasma::Package to KPackage 2016-12-26 17:41:06 +01:00
kwinscripts.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2017-03-25 04:37:53 +01:00
kwinscripts.knsrc SVN_SILENT made messages (.desktop file) - always resolve ours 2017-06-25 04:33:13 +02:00
main.cpp Remove KDE/ prefix in include directories 2014-03-17 16:24:10 +01:00
Messages.sh Import of a KCM for KWin scripts 2011-12-21 07:28:51 +01:00
module.cpp [KWin Scripts KCM] Restore "import" option 2017-04-26 17:11:34 +02:00
module.h [KWin Scripts KCM] Restore "import" option 2017-04-26 17:11:34 +02:00
module.ui [KWin Scripts KCM] Restore "import" option 2017-04-26 17:11:34 +02:00
version.h.cmake Import of a KCM for KWin scripts 2011-12-21 07:28:51 +01:00