# Conflicts:
#	plugins/quickopen/expandingtree/expandingdelegate.cpp
#	plugins/quickopen/expandingtree/expandingwidgetmodel.cpp
#	plugins/quickopen/quickopenmodel.cpp
#	shell/runcontroller.cpp
#	shell/sessionlock.cpp