kwin/effects/resize
l10n daemon script 262da1b7c9 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-07 13:20:00 +00:00
..
CMakeLists.txt Deprecate kservice_desktop_to_json(), use kcoreaddons_desktop_to_json() instead. 2015-01-16 22:52:26 +01:00
resize.cpp [effects] Get xcb_connection_t* and rootWindow through EffectsHandler API 2014-04-16 16:05:05 +02:00
resize.h [kwin] Add a virtual Effect::requestedEffectChainPosition 2014-03-28 14:04:54 +01:00
resize.kcfg Use KConfigXT in Resize Effect 2012-09-14 10:39:28 +02:00
resize_config.cpp Do not register dbus service org.kde.kwin.Effects 2014-05-15 10:55:29 +02:00
resize_config.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2015-04-07 13:20:00 +00: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