You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
l10n daemon script 8b1a5f27df 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"
8 years ago
..
backgroundcontrast respect WindowForceBlurRole or forcecontrast 9 years ago
blur respect WindowForceBlurRole or forcecontrast 9 years ago
coverswitch SVN_SILENT made messages (.desktop file) - always resolve ours 8 years ago
cube [effects] Remove clip plane from Cube effect 9 years ago
desktopgrid Revert "desktop grid: zoom hovered window" 9 years ago
dialogparent SVN_SILENT made messages (.desktop file) - always resolve ours 9 years ago
diminactive Use SERVICE_TYPES parameter to kcoreaddons_desktop_to_json() 9 years ago
dimscreen [effects] Drop the .desktop files for the BuiltIn Effects 11 years ago
eyeonscreen SVN_SILENT made messages (.desktop file) - always resolve ours 8 years ago
fade SVN_SILENT made messages (.desktop file) - always resolve ours 9 years ago
fadedesktop SVN_SILENT made messages (.desktop file) - always resolve ours 9 years ago
fallapart [effects] Drop the .desktop files for the BuiltIn Effects 11 years ago
flipswitch Port to CMake AUTOMOC 9 years ago
glide Use SERVICE_TYPES parameter to kcoreaddons_desktop_to_json() 9 years ago
highlightwindow invalidate iterator on removing pointed element 10 years ago
invert Port to CMake AUTOMOC 9 years ago
kscreen do not reinterpret_cast insufficient data 9 years ago
login SVN_SILENT made messages (.desktop file) - always resolve ours 9 years ago
logout [effects] Check for LimitedNPOT 9 years ago
lookingglass [effects] Check for LimitedNPOT 9 years ago
magiclamp SVN_SILENT made messages (.desktop file) - always resolve ours 9 years ago
magnifier Port to CMake AUTOMOC 9 years ago
maximize SVN_SILENT made messages (.desktop file) - always resolve ours 8 years ago
minimizeanimation [effects] Drop the .desktop files for the BuiltIn Effects 11 years ago
morphingpopups SVN_SILENT made messages (.desktop file) - always resolve ours 8 years ago
mouseclick SVN_SILENT made messages (.desktop file) - always resolve ours 9 years ago
mousemark Port to CMake AUTOMOC 9 years ago
presentwindows [effects] Don't assume windowInputMouseEvents only carries QMouseEvents 9 years ago
resize [effects] Use shader traits in Resize 9 years ago
scalein SVN_SILENT made messages (.desktop file) - always resolve ours 9 years ago
screenedge [effects] Use shader traits api in screenedge effect 9 years ago
screenshot Revert "Handle conflicts between epoxy and manually resolved function pointers" 9 years ago
sheet [effects] Drop the .desktop files for the BuiltIn Effects 11 years ago
showfps SVN_SILENT made messages (.desktop file) - always resolve ours 8 years ago
showpaint [effects] Use shader traits in ShowPaint effect 9 years ago
slide Port to CMake AUTOMOC 9 years ago
slideback explicitly update the stack track on unminimization 9 years ago
slidingpopups update expanded geometry when slide is done 9 years ago
snaphelper [effects] Use shader traits in SnapHelper effect 9 years ago
startupfeedback [effects] Combine all shaders in resources 9 years ago
thumbnailaside Port to CMake AUTOMOC 9 years ago
trackmouse [effects] Use shader traits API in trackmouse 9 years ago
translucency SVN_SILENT made messages (.desktop file) - always resolve ours 9 years ago
windowaperture SVN_SILENT made messages (.desktop file) - always resolve ours 9 years ago
windowgeometry Use SERVICE_TYPES parameter to kcoreaddons_desktop_to_json() 9 years ago
wobblywindows Use SERVICE_TYPES parameter to kcoreaddons_desktop_to_json() 9 years ago
zoom Port to CMake AUTOMOC 9 years ago
CMakeLists.txt Morphingpopups effect, to animate tooltips 9 years ago
Messages.sh
effect_builtins.cpp Drop the Dashboard Effect 9 years ago
effect_builtins.h Drop the Dashboard Effect 9 years ago
kwineffect.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 9 years ago
logging.cpp Change default logging category to QtCriticalMsg 9 years ago
shaders.qrc [effects] Combine all shaders in resources 9 years ago