← Back to branch summary

~aacid/unity-2d/load_24bit_pixbuf_icons

~aacid/unity-2d/load_24bit_pixbuf_icons

Viewing all changes in revision 1071.

Committer: Albert Astals
Date: 2012-04-19 13:55:07 UTC
mfrom: (1069.1.5 unity-2d)
Revision ID: albert.astals@canonical.com-20120419135507-q3kd5anoeihic0sd

Merge lp:unity-2d

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

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

files renamed:
libunity-2d-private/tests/keyboardmodifiersmonitortest.cpp => libunity-2d-private/tests/keymonitortest.cpp

files modified:
libunity-2d-private/src/CMakeLists.txt

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

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

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

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

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

panel/applets/appname/appnameapplet.cpp

shell/app/shellmanager.cpp

shell/launcher/LauncherItem.qml

shell/launcher/LauncherList.qml

spread/Windows.qml

spread/Workspace.qml

spread/Workspaces.qml

tests/manual-tests/launcher.txt

tests/manual-tests/window-manager.txt

Show diffs side-by-side

added added

removed removed

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

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

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

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

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

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

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

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

libunity-2d-private/tests/keymonitortest.cpp

panel/applets/appname/appnameapplet.cpp

shell/app/shellmanager.cpp

shell/launcher/LauncherItem.qml

shell/launcher/LauncherList.qml

spread/Windows.qml

spread/Workspace.qml

spread/Workspaces.qml

tests/manual-tests/launcher.txt

tests/manual-tests/window-manager.txt

Older »