← Back to branch summary

~aacid/unity-2d/unity-2d_backport_shell_r934

~aacid/unity-2d/unity-2d_backport_shell_r934

Viewing all changes in revision 890.

Committer: Albert Astals
Date: 2012-02-03 20:59:54 UTC
mfrom: (883.1.10 unity-2d)
Revision ID: albert.astals@canonical.com-20120203205954-o4ssxs1rtjx4shv3

merge

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

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

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

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

places/RatingStars.qml

places/app/dashdeclarativeview.cpp

places/places.qmlproject

places/utils.js

spread/app/spread.xml

spread/app/spreadcontrol.cpp

spread/app/spreadcontrol.h

spread/app/spreadview.cpp

spread/app/spreadview.h

tests/launcher/autohide_show_tests.rb

tests/manual-tests/places.txt

Show diffs side-by-side

added added

removed removed

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

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

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

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

places/RatingStars.qml

places/app/dashdeclarativeview.cpp

places/places.qmlproject

places/utils.js

spread/app/spread.xml

spread/app/spreadcontrol.cpp

spread/app/spreadcontrol.h

spread/app/spreadview.cpp

spread/app/spreadview.h

tests/launcher/autohide_show_tests.rb

tests/manual-tests/places.txt

Older »