summaryrefslogtreecommitdiffstats
path: root/src/tools/qdoc/cppcodeparser.cpp
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2015-04-15 14:06:47 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2015-04-15 15:53:16 +0000
commitf98d125b2928d0784d509c8025271fca661ea270 (patch)
tree214aa16bf1782a8819b1d7fd801ab9c62af4cae1 /src/tools/qdoc/cppcodeparser.cpp
parentc09ff1dbcb50d77b64e47b333fd1ee2f4c6510e7 (diff)
parent605617b5dce6ccd8826d07aabe2db781ae3aa9b4 (diff)
Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5
Diffstat (limited to 'src/tools/qdoc/cppcodeparser.cpp')
0 files changed, 0 insertions, 0 deletions