kwin/effects/resize
l10n daemon script 90306f5c08 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"
2019-01-06 05:42:41 +01:00
..
CMakeLists.txt Use SERVICE_TYPES parameter to kcoreaddons_desktop_to_json() 2015-12-09 23:42:45 +00:00
resize.cpp Remove Qt module declarations in includes 2018-06-05 18:07:23 +01:00
resize.h [kwin] Add a virtual Effect::requestedEffectChainPosition 2014-03-28 14:04:54 +01:00
resize.kcfg [effects] Use arg="true" in the kcfg files 2017-04-15 10:03:34 +02:00
resize_config.cpp [effects] Use arg="true" in the kcfg files 2017-04-15 10:03:34 +02:00
resize_config.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2019-01-06 05:42:41 +01:00
resize_config.h Use Q_SLOTS and Q_SIGNALS instead of slots and signals 2013-07-24 09:46:54 +02:00
resize_config.ui Use KConfigXT in Resize Effect 2012-09-14 10:39:28 +02:00
resizeconfig.kcfgc Use KConfigXT in Resize Effect 2012-09-14 10:39:28 +02:00