diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-02-22 09:45:06 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-02-22 09:45:06 +0100 |
| commit | 27de678783804bd75012b304f09080ffb56a93bf (patch) | |
| tree | 9fca7b37b6421d0b4641878614179cf24dea41e2 /src/libs/cplusplus/pp-engine.cpp | |
| parent | 4ae4f05f9101c29ce77c58ee104546a98cb4805a (diff) | |
| parent | 619e52ebc2e47e3a024c1df57a772e35b2bb6943 (diff) | |
| download | qt-creator-27de678783804bd75012b304f09080ffb56a93bf.tar.gz | |
Merge remote-tracking branch 'origin/2.6' into 2.7
Conflicts:
share/qtcreator/translations/qtcreator_uk.ts
Change-Id: Idedbd2dd847e7429e5455eddabc0b7e191dcb703
Diffstat (limited to 'src/libs/cplusplus/pp-engine.cpp')
0 files changed, 0 insertions, 0 deletions