diff options
| author | dt <qtc-committer@nokia.com> | 2010-10-04 16:07:46 +0200 |
|---|---|---|
| committer | dt <qtc-committer@nokia.com> | 2010-10-04 16:07:46 +0200 |
| commit | 6b6d9871b80d37c679998c332b94537e5f23d6c1 (patch) | |
| tree | c19b656a61b06da2da1e66a4fe0b4386399b6ac4 /src/plugins/snippets/snippetsplugin.cpp | |
| parent | a84ad42741d4f3ac2f35ba3303f94a034f2d50ba (diff) | |
| parent | c7142affef4b4ea78306254b62da13d66f9be0af (diff) | |
| download | qt-creator-6b6d9871b80d37c679998c332b94537e5f23d6c1.tar.gz | |
Merge remote branch 'origin/2.1'
Conflicts:
share/qtcreator/templates/mobileapp/app.pro
share/qtcreator/templates/qmlapp/app.pro
src/plugins/cpptools/cpptools.pro
Diffstat (limited to 'src/plugins/snippets/snippetsplugin.cpp')
0 files changed, 0 insertions, 0 deletions