Skip to content
Snippets Groups Projects
Commit ede2a7c9 authored by con's avatar con
Browse files

Merge remote branch 'origin/2.0' 

Conflicts:
	doc/qtcreator.qdoc
	share/qtcreator/gdbmacros/dumper.py
	src/libs/qmljs/qmljs-lib.pri
	src/plugins/debugger/breakhandler.cpp
	src/plugins/projectexplorer/projectexplorer.h
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.h
parents 82cc4b43 21b211fe
No related branches found
No related tags found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 13570 additions and 2523 deletions
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