shift-shell/shell/contents/views
Marco Martin 264bff2854 Merge branch 'mart/newContainmentShell'
Conflicts:
	CMakeLists.txt
	shell/contents/views/Desktop.qml
2015-05-12 16:22:17 +02:00
..
Desktop.qml Merge branch 'mart/newContainmentShell' 2015-05-12 16:22:17 +02:00
Dialer.qml correct call time 2014-11-13 14:35:47 +01:00
Panel.qml use an actual panel 2015-03-13 22:16:19 +01:00
Pin.qml pin entry should work 2014-11-13 16:20:06 +01:00