Viewing all changes in revision 1590.
- Committer: Mirco Müller
- Date: 2015-03-06 14:22:41 UTC
- mfrom: (1589.1.1 unity8)
- Revision ID: mirco.mueller@ubuntu.com-20150306142241-wse3a2j2yghqfwoh
Merged kgunn's conflict-resolving branch
- files added:
- po/ce.po
- files removed:
- qml/Components/VolumeKeyFilter.qml
- files renamed:
- com.canonical.Unity8.gschema.xml => data/com.canonical.Unity8.gschema.xml
- qml/Greeter/GreeterContent.qml => qml/Greeter/CoverPage.qml
- tests/mocks/Unity/Application/MirSurfaceItem.cpp => tests/mocks/Unity/Application/GenericApp.cpp
- tests/mocks/Unity/Application/MirSurfaceItem.h => tests/mocks/Unity/Application/GenericApp.h
- files modified:
- CMakeLists.txt
expand all
collapse all
added
removed
