summaryrefslogtreecommitdiff
path: root/src/plugins/cpptools/cppcodegen_test.cpp
diff options
context:
space:
mode:
authorOrgad Shaneh <orgad.shaneh@audiocodes.com>2013-12-02 23:28:58 +0200
committerOrgad Shaneh <orgads@gmail.com>2013-12-09 11:14:02 +0100
commit4a5af14b7f1260f2a4d2bb7c4bd3883fc5baf524 (patch)
tree6112b46183a30818c0cb6e0df0de8f2a971266a3 /src/plugins/cpptools/cppcodegen_test.cpp
parent0c0c1cd58ff0af2371ee7e5ead9b4a412e27f90e (diff)
downloadqt-creator-4a5af14b7f1260f2a4d2bb7c4bd3883fc5baf524.tar.gz
Git: Enable choosing non-fast-forward merge
Change-Id: I5972489d06637616953bd0d93a3b65c4d9918377 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Diffstat (limited to 'src/plugins/cpptools/cppcodegen_test.cpp')
0 files changed, 0 insertions, 0 deletions