Merge remote-tracking branch 'origin/3.0'
authorEike Ziller <eike.ziller@digia.com>
Fri, 15 Nov 2013 09:26:57 +0000 (10:26 +0100)
committerEike Ziller <eike.ziller@digia.com>
Fri, 15 Nov 2013 09:26:57 +0000 (10:26 +0100)
commit4538ccb46c3cde7c2f018ba95a4186ecc551bbfa
treeba14ead9ad0247c0ec6b8bb622867e59d90ea7a9
parentb9a85f5a087ec89816bedf38f69d80ecdb639c18
parent0904f6e836d27fdc5567a1ce7a57ce964a325233
Merge remote-tracking branch 'origin/3.0'

Conflicts:
share/qtcreator/debugger/gdbbridge.py

Change-Id: I32d8158c475f927b50ef06fde9ab8189ebdbcbbc
14 files changed:
share/qtcreator/debugger/dumper.py
share/qtcreator/debugger/gdbbridge.py
share/qtcreator/debugger/stdtypes.py
src/plugins/android/androiddeployqtstep.cpp
src/plugins/coreplugin/editormanager/editormanager.cpp
src/plugins/git/gitclient.cpp
src/plugins/git/gitclient.h
src/plugins/projectexplorer/clangparser.h
src/plugins/projectexplorer/projectexplorer.cpp
src/plugins/projectexplorer/projectexplorerconstants.h
src/plugins/qbsprojectmanager/qbsproject.cpp
src/plugins/qmakeprojectmanager/qmakenodes.cpp
src/plugins/qmakeprojectmanager/qmakeproject.cpp
src/plugins/qmlprojectmanager/qmlproject.cpp