Diffusion KWin cdc743b8f420

Merge branch 'KDE/4.11'
cdc743b8f420
Actions

Authored by luebking on Jan 30 2014, 7:55 PM.

Description

Merge branch 'KDE/4.11'

Conflicts:
kwin/effects/mouseclick/mouseclick.cpp
plasma/generic/scriptengines/python/plasma-scriptengine-dataengine-python.desktop
plasma/generic/scriptengines/python/plasma-scriptengine-runner-python.desktop
plasma/generic/scriptengines/ruby/plasma-scriptengine-ruby-applet.desktop
plasma/generic/scriptengines/ruby/plasma-scriptengine-ruby-dataengine.desktop

Details

Committed
luebkingJan 30 2014, 7:55 PM
Parents
R108:97a6676a4fa9: depend noborder on motif_noborder after reshape
R108:49a320212473: [kwin] Add a test application for testing size increment
Branches
Unknown
Tags
Unknown

Merged Changes

CommitAuthorDetailsCommitted
97a6676a4fa9luebking
depend noborder on motif_noborder after reshape 
Jan 30 2014
ce32856c8543luebking
mouseclick FX, don't collect clicks unless active 
Jan 30 2014
c8713ce095f3l10n daemon script
SVN_SILENT made messages (.desktop file) 
Jan 30 2014

Changes (2)

PathPackages
Mclient.cpp
Meffects/mouseclick/mouseclick.cpp

R108:cdc743b8f420

View Options

client.cpp

Loading...
View Options

effects/mouseclick/mouseclick.cpp

Loading...