Merge remote branch 'origin/1.3'
Conflicts: doc/qtcreator.qdoc src/plugins/debugger/watchhandler.cpp
doc/fixnavi.pl
0 → 100755
This diff is collapsed.
This diff is collapsed.
Conflicts: doc/qtcreator.qdoc src/plugins/debugger/watchhandler.cpp