Viewing all changes in revision 138.3.24.
- Committer: Michael Terry
- Date: 2013-09-18 20:59:03 UTC
- mfrom: (332 trunk)
- mto: (138.5.2 split-logrotate)
- mto: This revision was merged to the branch mainline in revision 933.
- Revision ID: michael.terry@canonical.com-20130918205903-tzfqs8nju98mcjr3
Merge from trunk
- files added:
- tests/autopilot/unity8/application_lifecycle
- tests/autopilot/unity8/application_lifecycle/tests
- files removed:
- Dash/graphics/phone/home.png
- graphics/people
- tests/plugins/SessionBroadcast
- files modified:
- Components/VolumeControl.qml
expand all
collapse all
added
removed
Dash/graphics/phone/home.png
Dash/graphics/phone/music.png
Dash/graphics/phone/videos.png
Dash/graphics/tablet/apps.png
Dash/graphics/tablet/home.png
Dash/graphics/tablet/music.png
Dash/graphics/tablet/people.png
Dash/graphics/tablet/videos.png
