shift-shell/shell
Marco Martin 264bff2854 Merge branch 'mart/newContainmentShell'
Conflicts:
	CMakeLists.txt
	shell/contents/views/Desktop.qml
2015-05-12 16:22:17 +02:00
..
contents Merge branch 'mart/newContainmentShell' 2015-05-12 16:22:17 +02:00
metadata.desktop better name 2014-09-26 21:07:19 +02:00