Merge commit '84c82a669b8edd18a49b0eadaaee62eced27c51c'

Browse Source

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

...

This commit is contained in:

Oswald Buddenhagen

2009-02-25 15:47:35 +01:00

parent 788f84f792 84c82a669b

commit 270faea5ce

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available