Viewing all changes in revision 1290.
- Committer: Ying-Chun Liu
- Date: 2014-09-29 14:10:02 UTC
- mfrom: (1287.1.13 unity8)
- Revision ID: paul.liu@canonical.com-20140929141002-t2zhj244w584lmt4
merge trunk
- files added:
- plugins/Utils/relativetimeformatter.cpp
- files removed:
- plugins/Unity/Indicators/resources
- plugins/Unity/Indicators/resources/artwork
- plugins/Unity/Indicators/resources/artwork/messaging
- files renamed:
- tests/qmltests/Components/tst_DragHandle/UnityLogo.png => tests/qmltests/UnityLogo.png
- files modified:
- debian/changelog
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
