Viewing all changes in revision 666.
- Committer: Daniel d'Andrada
- Date: 2013-06-05 14:11:51 UTC
- mfrom: (651.2.83 phablet)
- Revision ID: daniel.dandrada@canonical.com-20130605141151-6gfzljhtew6yqru0
Merge with lp:unity/phablet
- files added:
- .bzr-builddeb
- Notifications
- plugins/LightDM
- plugins/Ubuntu
- plugins/Ubuntu/Gestures
- po
- tests/mocks/LightDM
- tests/mocks/LightDM/QLightDM
- tests/mocks/LightDM/QLightDM/Greeter
- tests/mocks/LightDM/QLightDM/InfographicModel
- tests/mocks/LightDM/QLightDM/UsersModel
- tests/mocks/LightDM/demo
- tests/mocks/LightDM/full
- tests/mocks/LightDM/single
- tests/plugins/Ubuntu
- tests/plugins/Ubuntu/Gestures
- tests/qmltests/Dash/qml
- tests/qmltests/Notifications
- files removed:
- CTestCustom.cmake.in
- include
- include/unity
- include/unity/api
- include/unity/api/internal
- include/unity/internal
- include/unity/scopes
- include/unity/scopes/internal
- include/unity/util
- include/unity/util/internal
- src/unity
- src/unity/api
- src/unity/api/internal
- src/unity/api/scopes
- src/unity/api/scopes/internal
- src/unity/internal
- src/unity/util
- src/unity/util/internal
- tests/cleanincludes
- tests/gtest
- tests/gtest/libgtest
- tests/gtest/unity
- tests/gtest/unity/api
- tests/gtest/unity/api/Version
- tests/gtest/unity/scopes
- tests/gtest/unity/util
- tests/gtest/unity/util/Daemon
- tests/gtest/unity/util/DefinesPtrs
- tests/gtest/unity/util/FileIO
- tests/gtest/unity/util/internal
- tests/gtest/unity/util/internal/ResourcePtr
- tests/headers
- files renamed:
- Greeter/graphics/icon_arrow@20.png => Greeter/graphics/icon_arrow.png
- Launcher/LauncherShortcuts.qml => Launcher/LauncherPanel.qml
- src/CMakeLists.txt => src/CMakeLists.txt.THIS
- tests/qmltests/Greeter/tst_Greeter.qml => tests/qmltests/Greeter/tst_Tablet.qml
- files modified:
- Applications/applications.js
expand all
collapse all
added
removed
Greeter/graphics/dot_empty.png
Greeter/graphics/dot_filled.png
Greeter/graphics/dot_pointer.png
Greeter/graphics/infographic_circle.png
Greeter/graphics/infographic_default@20.png
Greeter/graphics/infographic_tweeter_cut@18.png
Launcher/graphics/label_bubble@18.png
doc/DirectionalDragArea.svg
graphics/applicationIcons/calendar@18.png
graphics/applicationIcons/weather@18.png
