← Back to branch summary

~uriboni/unity-2d/clean-up-dash-dbus

~uriboni/unity-2d/clean-up-dash-dbus

Viewing all changes in revision 423.

Committer: Ugo Riboni
Date: 2011-03-03 10:57:38 UTC
mfrom: (420.1.3 trunk)
Revision ID: ugo.riboni@canonical.com-20110303105738-d9ygtk7ag2n92i8d

Merge changes from trunk

files added:
libunity-2d-private/Unity2d/dropitem.cpp

libunity-2d-private/Unity2d/dropitem.h

files modified:
debian/libunity-2d-private0.symbols

launcher/Launcher.qml

launcher/LauncherItem.qml

launcher/LauncherList.qml

launcher/UnityApplications/launcherapplication.cpp

launcher/app/launcherview.cpp

launcher/app/launcherview.h

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

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

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

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

po/fr.po

Show diffs side-by-side

added added

removed removed

debian/libunity-2d-private0.symbols

launcher/Launcher.qml

launcher/LauncherItem.qml

launcher/LauncherList.qml

launcher/UnityApplications/launcherapplication.cpp

launcher/app/launcherview.cpp

launcher/app/launcherview.h

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

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

libunity-2d-private/Unity2d/dropitem.h

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

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

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

Older »