Viewing all changes in revision 353.1.35.
- Committer: Olivier Tilloy
- Date: 2011-02-07 17:21:35 UTC
- mfrom: (359.2.33 maverick)
- mto: (359.2.43 maverick)
- mto: This revision was merged to the branch mainline in revision 384.
- Revision ID: olivier.tilloy@canonical.com-20110207172135-qk79mrsxfwqkx2ek
Merge the latest changes from the trunk, resolving conflicts in launcher/app/launcher.cpp.
- files added:
- .bzr-builddeb
- libunity-2d
- libunity-2d/Unity2d
- libunity-2d/src
- libunity-2d/tests
- panel/applets/common
- files removed:
- debian/libuqpanel-dev.install
- panel/lib
- places/UnityPlaces
- files renamed:
- places/UnityPlaces/CMakeLists.txt => libunity-2d/Unity2d/CMakeLists.txt
- places/UnityPlaces/blendedimageprovider.cpp => libunity-2d/Unity2d/blendedimageprovider.cpp
- places/UnityPlaces/blendedimageprovider.h => libunity-2d/Unity2d/blendedimageprovider.h
- places/UnityPlaces/plugin.cpp => libunity-2d/Unity2d/plugin.cpp
- places/UnityPlaces/plugin.h => libunity-2d/Unity2d/plugin.h
- places/UnityPlaces/qmldir => libunity-2d/Unity2d/qmldir
- places/UnityPlaces/qsortfilterproxymodelqml.cpp => libunity-2d/Unity2d/qsortfilterproxymodelqml.cpp
- places/UnityPlaces/qsortfilterproxymodelqml.h => libunity-2d/Unity2d/qsortfilterproxymodelqml.h
- places/UnityPlaces/windowimageprovider.cpp => libunity-2d/Unity2d/windowimageprovider.cpp
- places/UnityPlaces/windowimageprovider.h => libunity-2d/Unity2d/windowimageprovider.h
- places/UnityPlaces/windowinfo.cpp => libunity-2d/Unity2d/windowinfo.cpp
- places/UnityPlaces/windowinfo.h => libunity-2d/Unity2d/windowinfo.h
- places/UnityPlaces/windowslist.cpp => libunity-2d/Unity2d/windowslist.cpp
- places/UnityPlaces/windowslist.h => libunity-2d/Unity2d/windowslist.h
- panel/lib/debug_p.h => libunity-2d/src/debug_p.h
- panel/lib/keyboardmodifiersmonitor.cpp => libunity-2d/src/keyboardmodifiersmonitor.cpp
- panel/lib/keyboardmodifiersmonitor.h => libunity-2d/src/keyboardmodifiersmonitor.h
- panel/lib/unity2dapplication.cpp => libunity-2d/src/unity2dapplication.cpp
- panel/lib/unity2dapplication.h => libunity-2d/src/unity2dapplication.h
- panel/tests/keyboardmodifiersmonitortest.cpp => libunity-2d/tests/keyboardmodifiersmonitortest.cpp
- panel/lib/unity2dstyle.cpp => panel/app/unity2dstyle.cpp
- panel/lib/unity2dstyle.h => panel/app/unity2dstyle.h
- panel/lib/applet.cpp => panel/applets/common/applet.cpp
- panel/lib/applet.h => panel/applets/common/applet.h
- files modified:
- .bzrignore
expand all
collapse all
added
removed
launcher/artwork/glow.png
