Viewing all changes in revision 1261.
- Committer: Michael Zanetti
- Date: 2014-10-10 15:54:34 UTC
- mfrom: (1258.1.96 unity8)
- Revision ID: michael.zanetti@canonical.com-20141010155434-ua79cn10vdknmdff
merge trunk
- files added:
- data/unity8-filewatcher.conf
- src/libunity8-private
- tests/mocks/Ubuntu/Connectivity
- files removed:
- plugins/Unity/Indicators/resources
- plugins/Unity/Indicators/resources/artwork
- plugins/Unity/Indicators/resources/artwork/messaging
- plugins/Unity/Launcher/backend
- plugins/Unity/Launcher/common
- files renamed:
- plugins/Unity/Launcher/common/quicklistentry.cpp => plugins/Unity/Launcher/quicklistentry.cpp
- plugins/Unity/Launcher/common/quicklistentry.h => plugins/Unity/Launcher/quicklistentry.h
- tests/qmltests/Greeter/tst_Lockscreen.qml => tests/qmltests/Components/tst_Lockscreen.qml
- tests/qmltests/Components/tst_DragHandle/UnityLogo.png => tests/qmltests/UnityLogo.png
- files modified:
- CMakeLists.txt
expand all
collapse all
added
removed
plugins/Unity/Indicators/resources/artwork/messaging/default_app.svg
plugins/Unity/Indicators/resources/artwork/messaging/default_contact.png
qml/Stages/graphics/PageHeaderBaseDividerBottom@18.png
qml/Stages/graphics/PageHeaderBaseDividerLight@18.png
qml/Stages/graphics/background_paper@27.png
