diff options
| author | con <qtc-committer@nokia.com> | 2011-03-11 09:25:57 +0100 |
|---|---|---|
| committer | con <qtc-committer@nokia.com> | 2011-03-11 09:25:57 +0100 |
| commit | d3f798d3b0f38a2999c9196a07334fe8bceefeba (patch) | |
| tree | 244657689906443c0cef6cd78b8e0b429f4ace57 /qtcreator.pri | |
| parent | ac28279efe8e5ed59c68842f38b93a2bc889e668 (diff) | |
| parent | 6adc5b123a6fc92bdf8b26e237b14c441624e2e6 (diff) | |
| download | qt-creator-d3f798d3b0f38a2999c9196a07334fe8bceefeba.tar.gz | |
Merge remote branch 'origin/2.1' into 2.2
Conflicts:
doc/qtcreator.qdoc
Diffstat (limited to 'qtcreator.pri')
0 files changed, 0 insertions, 0 deletions