Merge remote-tracking branch 'origin/3.0'

Conflicts:
	share/qtcreator/debugger/gdbbridge.py

Change-Id: I32d8158c475f927b50ef06fde9ab8189ebdbcbbc
This commit is contained in:
Eike Ziller
2013-11-15 10:26:57 +01:00
326 changed files with 6324 additions and 4987 deletions

View File

@@ -50,6 +50,7 @@ private:
QRegExp m_inLineRegExp;
QRegExp m_messageRegExp;
QRegExp m_summaryRegExp;
QRegExp m_codesignRegExp;
bool m_expectSnippet;
};