← Back to branch summary

~dyams/unity-2d/mm-updates-pips

~dyams/unity-2d/mm-updates-pips

Viewing all changes in revision 919.

Committer: LDS
Date: 2012-02-14 14:43:58 UTC
mfrom: (917.1.6 centralized-hotkeys)
Revision ID: lohith.shivamurthy@canonical.com-20120214144358-rpfavv1xjp4migy5

merge bzr merge lp:~dyams/unity-2d/centralized-hotkeys

files modified:
libunity-2d-private/src/screeninfo.cpp

libunity-2d-private/src/screeninfo.h

shell/app/shelldeclarativeview.cpp

shell/app/shelldeclarativeview.h

shell/app/shellmanager.cpp

shell/app/shellmanager.h

Show diffs side-by-side

added added

removed removed

libunity-2d-private/src/screeninfo.cpp

libunity-2d-private/src/screeninfo.h

shell/app/shelldeclarativeview.cpp

shell/app/shelldeclarativeview.h

shell/app/shellmanager.cpp

shell/app/shellmanager.h

Older »