Viewing all changes in revision 472.
- Committer: Nick Dedekind
- Date: 2013-12-10 14:22:43 UTC
- mfrom: (464.1.117 unity8)
- Revision ID: nicholas.dedekind@gmail.com-20131210142243-wsshu2dovlmzviqz
merged with trunk
- files added:
- Dash/DashCarousel.qml
- Dash/Music/graphics
- tests/mocks/QtMultimedia
- tests/mocks/data
- tests/mocks/data/applications
- tests/plugins/LightDM
- tests/qmltests/Dash/Music
- tests/qmltests/Panel/Indicators
- files removed:
- Applications
- files renamed:
- Dash/Video/VideosCarousel.qml => Dash/Video/VideoCarousel.qml
- plugins/Unity/bottombarvisibilitycommunicatorshell.cpp => plugins/Utils/bottombarvisibilitycommunicatorshell.cpp
- plugins/Unity/bottombarvisibilitycommunicatorshell.h => plugins/Utils/bottombarvisibilitycommunicatorshell.h
- plugins/Unity/categoryresults.cpp => tests/mocks/Unity/categoryresults.cpp
- plugins/Unity/categoryresults.h => tests/mocks/Unity/categoryresults.h
- plugins/Unity/iconutils.cpp => tests/mocks/Unity/iconutils.cpp
- plugins/Unity/iconutils.h => tests/mocks/Unity/iconutils.h
- tests/plugins/Ubuntu/Gestures/edgeDragExample.qml => tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.qml
- files modified:
- Bottombar/Bottombar.qml
- tests/autopilot/unity8/shell/emulators/create_interactive_notification.py *
expand all
collapse all
added
removed
Dash/Music/graphics/music_progress_bg.png
Dash/graphics/phone/screenshots/angrybirds@12.png
Dash/graphics/tooltip_arrow@27.png
graphics/applicationIcons/angrybirds@18.png
graphics/applicationIcons/media-player@18.png
graphics/applicationIcons/music@18.png
graphics/applicationIcons/ski_safari@18.png
graphics/applicationIcons/skype@18.png
