summaryrefslogtreecommitdiff
path: root/src/plugins/cpptools/cpppreprocessor.cpp
diff options
context:
space:
mode:
authorPetar Perisin <petar.perisin@gmail.com>2013-10-05 16:10:54 +0200
committerPetar Perisin <petar.perisin@gmail.com>2013-10-22 20:42:50 +0200
commitab71755326eeee537fb9eee157d7fffcd54cb723 (patch)
treed8a7c8250f4f1dd6deb67f890e47de779f0b9dbf /src/plugins/cpptools/cpppreprocessor.cpp
parent36e6a705052c005529eb8558736e1c9df6865355 (diff)
downloadqt-creator-ab71755326eeee537fb9eee157d7fffcd54cb723.tar.gz
Git: Fix popup message for merge
Change-Id: Ie3ef79343b84d615255b70b786347c57511c3309 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Diffstat (limited to 'src/plugins/cpptools/cpppreprocessor.cpp')
0 files changed, 0 insertions, 0 deletions