Daniel Schukies 420d36f025 Merge remote-tracking branch 'origin/feature/Sidebar' into MonitorSelection ... # Conflicts: # src/monitorlistmodel.cpp # src/monitorlistmodel.h		2017-07-10 16:48:13 +02:00
..
Components	Merge remote-tracking branch 'origin/feature/Sidebar' into MonitorSelection	2017-07-10 16:48:13 +02:00
main.qml	Removed no longer needed workaround due to 5.9	2017-06-26 22:01:19 +02:00