Viewing all changes in revision 506.
- Committer: Allan LeSage
- Date: 2013-12-19 16:53:50 UTC
- mfrom: (478.1.124 trunk)
- Revision ID: allan.lesage@canonical.com-20131219165350-m492c0wyeelqo4v1
Merged trunk.
- files added:
- data/CMakeLists.txt
- include
- qml
- qml/Dash/Music/graphics
- tests/mocks/QtMultimedia
- tests/plugins/LightDM
- tests/qmltests/Dash/Music
- files removed:
- Applications
- files renamed:
- unity8.desktop.in => data/unity8.desktop.in
- paths.h.in => include/paths.h.in
- plugins/ListViewWithPageHeader/ => plugins/DashViews/
- plugins/Unity/Indicators/timeformatter.cpp => plugins/Utils/timeformatter.cpp
- plugins/Unity/Indicators/timeformatter.h => plugins/Utils/timeformatter.h
- Bottombar/ => qml/Bottombar/
- Components/ => qml/Components/
- Dash/ => qml/Dash/
- Greeter/ => qml/Greeter/
- Hud/ => qml/Hud/
- Launcher/ => qml/Launcher/
- Notifications/ => qml/Notifications/
- Panel/ => qml/Panel/
- Shell.qml => qml/Shell.qml
- SideStage/ => qml/SideStage/
- graphics/ => qml/graphics/
- ApplicationArguments.h => src/ApplicationArguments.h
- MouseTouchAdaptor.cpp => src/MouseTouchAdaptor.cpp
- MouseTouchAdaptor.h => src/MouseTouchAdaptor.h
- main.cpp => src/main.cpp
- tests/plugins/ListViewWithPageHeader/ => tests/plugins/DashViews/
- tests/plugins/ListViewWithPageHeader/test.qml => tests/plugins/DashViews/listviewwithpageheadertest.qml
- tests/plugins/ListViewWithPageHeader/test_section.qml => tests/plugins/DashViews/listviewwithpageheadertestsection.qml
- tests/plugins/ListViewWithPageHeader/test_sectionexternalmodel.qml => tests/plugins/DashViews/listviewwithpageheadertestsectionexternalmodel.qml
- tests/plugins/Unity/Indicators/timeformattertest.cpp => tests/plugins/Utils/timeformattertest.cpp
- files modified:
- .bzrignore
expand all
collapse all
added
removed
Dash/graphics/phone/screenshots/angrybirds@12.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
qml/Dash/Music/graphics/music_progress_bg.png
