← Back to branch summary

~unity-2d-team/unity-2d/enable-super-NumKey-shortcuts

~unity-2d-team/unity-2d/enable-super-NumKey-shortcuts

Viewing all changes in revision 920.

Committer: Michał Sawicz
Date: 2012-01-20 10:19:06 UTC
mfrom: (771.40.41 unity-2d)
Revision ID: michal.sawicz@canonical.com-20120120101906-585m0tzb47g064ac

Merge from trunk

files removed:
libunity-2d-private/src/launcherplaceslist.cpp

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

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

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

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

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

files modified:
libunity-2d-private/Unity2d/plugin.cpp

libunity-2d-private/src/CMakeLists.txt

tests/launcher/autohide_show_tests.rb

Show diffs side-by-side

added added

removed removed

libunity-2d-private/Unity2d/plugin.cpp

libunity-2d-private/src/CMakeLists.txt

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

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

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

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

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

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

tests/launcher/autohide_show_tests.rb

Older »