diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-08-05 14:24:23 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-08-05 14:24:23 +0200 |
| commit | f3a61e8bf7f5b8275c000a0cac70b561422d2230 (patch) | |
| tree | 0cf0631a5b53fdab930f8a7936aff9c9c1c0952f /.gitignore | |
| parent | 59b34b6b539c78384ea3fc4fd018fe063b4ede53 (diff) | |
| parent | b2ac3fd90ccfc21cf4c5bce353d8e08208961eeb (diff) | |
Merge remote-tracking branch 'origin/3.2'
Conflicts:
qtcreator.pri
qtcreator.qbs
src/plugins/android/androidglobal.h
Change-Id: I3367bf2ea47c088989175dddeed2210294346f4c
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index d98edd09bd..e507a19e1c 100644 --- a/.gitignore +++ b/.gitignore @@ -137,7 +137,6 @@ tmp/ /tests/manual/qml-ast2dot/qml-ast2dot /tests/manual/debugger/simple/libsimple_test_plugin.*dylib /tests/manual/debugger/simple/simple_test_app -/tests/manual/plain-cplusplus/plain-c++ /tests/manual/preprocessor/pp /tests/tools/cplusplus-ast2png/cplusplus-ast2png /tests/auto/aggregation/tst_aggregation |