diff options
| author | con <qtc-committer@nokia.com> | 2011-02-04 11:46:30 +0100 |
|---|---|---|
| committer | con <qtc-committer@nokia.com> | 2011-02-04 11:46:30 +0100 |
| commit | b69ab309cd013a23df3b4697fdade37b95074532 (patch) | |
| tree | ef47607ef922ce544c64c5da5f1a49738440b96b /src/shared/cplusplus/Lexer.h | |
| parent | 8c65637407f7f15f8dd9955ab0517c941370ffe3 (diff) | |
| parent | d4e5890286f56c1976a187e75eb48fdf64269e55 (diff) | |
| download | qt-creator-b69ab309cd013a23df3b4697fdade37b95074532.tar.gz | |
Merge remote branch 'origin/2.1'
Conflicts:
share/qtcreator/templates/mobileapp/app.pro
share/qtcreator/templates/qmlapp/app.pro
src/plugins/debugger/debuggeractions.cpp
Diffstat (limited to 'src/shared/cplusplus/Lexer.h')
0 files changed, 0 insertions, 0 deletions