Re: More devices into the Shortcut system...

2011-12-22 Thread Albert Astals Cid
El Dimarts, 20 de desembre de 2011, a les 21:48:30, Rick Stockton va escriure: > It is time for us to "Fish, or Cut Byte" on two alternative ways to > introduce Mouse-Oriented Shortcuts into Qt5 and KDE-Next: > > Todd RME has been suggesting a new design- oriented around DBUS. > Unfortunately, I d

Re: Conflict in merging kde-workspace KDE/4.8 → master

2011-12-22 Thread Aaron J. Seigo
On Thursday, December 22, 2011 16:32:34 Jacopo De Simoi wrote: > Hi guys, > > I tried to merge forward the KDE/4.8 branch to master and I got the > following error > > Auto-merging kdm/kfrontend/themes/ariya/KdmGreeterTheme.desktop > CONFLICT (add/add): Merge conflict in > kdm/kfrontend/themes/ar

Conflict in merging kde-workspace KDE/4.8 → master

2011-12-22 Thread Jacopo De Simoi
Hi guys, I tried to merge forward the KDE/4.8 branch to master and I got the following error Auto-merging kdm/kfrontend/themes/ariya/KdmGreeterTheme.desktop CONFLICT (add/add): Merge conflict in kdm/kfrontend/themes/ariya/KdmGreeterTheme.desktop Automatic merge failed; fix conflicts and then co

Re: Review Request: Stop warning messages printed by KHTML when closing Konqueror's configuration dialog

2011-12-22 Thread Commit Hook
--- This is an automatically generated e-mail. To reply, visit: http://git.reviewboard.kde.org/r/103500/#review9166 --- This review has been submitted with commit 4dae52261a34e9a5fbd3

Re: Review Request: Reset time format upon user request

2011-12-22 Thread Commit Hook
--- This is an automatically generated e-mail. To reply, visit: http://git.reviewboard.kde.org/r/103434/#review9163 --- This review has been submitted with commit 68ec5f077e20afe09def

Re: Review Request: Stop warning messages printed by KHTML when closing Konqueror's configuration dialog

2011-12-22 Thread David Faure
--- This is an automatically generated e-mail. To reply, visit: http://git.reviewboard.kde.org/r/103500/#review9158 --- Ship it! Ship It! - David Faure On Dec. 22, 2011, 12:25 a.m.