diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-01-08 10:38:20 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-01-08 10:38:20 +0100 |
| commit | b5b47f7df2a70064f5e1041cefb18636d20d0bd4 (patch) | |
| tree | 7f57b886355129a7dd13611787b7de96065dde3a /src/plugins/cpptools/cppsourceprocessor_test.cpp | |
| parent | 0a5186700c036a541f5fa0baebb5e9ce0d506fed (diff) | |
| parent | ecd9c4c813be37dec46514462f1fcba901165a93 (diff) | |
| download | qt-creator-b5b47f7df2a70064f5e1041cefb18636d20d0bd4.tar.gz | |
Merge remote-tracking branch 'origin/3.3'
Conflicts:
src/plugins/cppeditor/cppdocumentationcommenthelper.cpp
Change-Id: I2cf25eba1de149765a6c44ad354d606ce9de512d
Diffstat (limited to 'src/plugins/cpptools/cppsourceprocessor_test.cpp')
0 files changed, 0 insertions, 0 deletions