Viewing all changes in revision 1274.
- Committer: Michael Zanetti
- Date: 2014-09-29 09:43:18 UTC
- mfrom: (1263.1.37 unity8)
- Revision ID: michael.zanetti@canonical.com-20140929094318-veelh5cf4ewnkpta
merge/update
- 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:
- CMakeLists.txt
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
