← Back to branch summary

~osomon/unity-2d/launcher-items-keyboard-shortcuts

~osomon/unity-2d/launcher-items-keyboard-shortcuts

Viewing all changes in revision 554.

Committer: Olivier Tilloy
Date: 2011-05-02 14:23:08 UTC
mfrom: (552.2.2 unity-2d)
Revision ID: olivier.tilloy@canonical.com-20110502142308-8s1wlns6hy31ynor

Merged the latest changes to the trunk, thus resolving a conflict in launcher/LauncherList.qml.

files added:
libunity-2d-private/src/unity2ddeclarativeview.cpp

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

files modified:
CMakeLists.txt

launcher/LauncherList.qml

launcher/app/launcher.cpp

launcher/app/launcherview.cpp

launcher/app/launcherview.h

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

places/app/dashdeclarativeview.cpp

places/app/dashdeclarativeview.h

places/app/places.cpp

spread/app/spread.cpp

spread/app/spreadview.cpp

spread/app/spreadview.h

Show diffs side-by-side

added added

removed removed

launcher/LauncherList.qml

launcher/app/launcher.cpp

launcher/app/launcherview.cpp

launcher/app/launcherview.h

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

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

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

places/app/dashdeclarativeview.cpp

places/app/dashdeclarativeview.h

places/app/places.cpp

spread/app/spread.cpp

spread/app/spreadview.cpp

spread/app/spreadview.h

Older »