diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-10-09 18:10:09 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-10-09 18:10:09 +0200 |
| commit | 66627f658501620438ddddad60373358247c5e0c (patch) | |
| tree | 7487a409e29914b335c35e4d310e99389c6c29d1 | |
| parent | f14c683da4c46637689e6678431f1e1877c566ce (diff) | |
| parent | 70bd4d5253f134bf48a30544030bb832f1eba8b3 (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: I0520ca0382bd378650600d6985a7a6c502d476c6
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -70,7 +70,6 @@ bin/pixeltool* bin/qmake* bin/qdoc3* bin/qt3to4* -bin/qtdemo* bin/qttracereplay* bin/rcc* bin/uic* |