Commit 270faea5 authored by Oswald Buddenhagen's avatar Oswald Buddenhagen

Merge commit '84c82a66'

Conflicts:
	src/plugins/coreplugin/editormanager/editorgroup.cpp
	src/plugins/coreplugin/editormanager/editorgroup.h
	src/plugins/coreplugin/editormanager/stackededitorgroup.cpp
	src/plugins/coreplugin/editormanager/stackededitorgroup.h
	src/plugins/qt4projectmanager/buildparserfactory.cpp
	src/plugins/qt4projectmanager/buildparserfactory.h
	src/plugins/qt4projectmanager/gccparser.h
	src/plugins/qt4projectmanager/gccpreprocessor.cpp
	src/plugins/qt4projectmanager/gccpreprocessor.h
	src/plugins/qt4projectmanager/headerpath.h
	src/plugins/qt4projectmanager/msvcenvironment.cpp
	src/plugins/qt4projectmanager/msvcenvironment.h
	src/plugins/qt4projectmanager/msvcparser.h
parents 788f84f7 84c82a66
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment