feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/2.3'

Browse Source 
Conflicts:
	qtcreator.pri

Change-Id: Iaca68084799ae9aec257742c395609d6e8aa72cd
This commit is contained in:
Eike Ziller
2011-08-16 10:21:55 +02:00
parent 5606b9d239 629de47f92
commit bf8cb5d4fc
25 changed files with 17345 additions and 2631 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/3rdparty/cplusplus/AST.cpp vendored
View File

@@ -81,7 +81,7 @@ unsigned BaseSpecifierAST::firstToken() const
if (access_specifier_token)
return access_specifier_token;
if (name)
name->firstToken();
return name->firstToken();
// assert?
return 0;
}