diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-09-29 14:07:02 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-09-29 14:08:49 +0200 |
| commit | 189dc655bbb3b4f9e1e11596f5a0f4682326066d (patch) | |
| tree | 67527f791542775394332c2995887994bde9adc9 /.gitignore | |
| parent | 6fd5870df0fbad0187b6d8bf7e3b12afb2e7a66f (diff) | |
| parent | dfe853bff90444edf92a993e391df853780c9e8d (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
src/corelib/tools/qbytearray.cpp
src/gui/image/qimage.cpp
src/gui/image/qppmhandler.cpp
src/gui/kernel/qguiapplication.cpp
src/gui/painting/qpaintengine_raster.cpp
Change-Id: I7c1a8e7ebdfd7f7ae767fdb932823498a7660765
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index f48b330e1a..5a23b64d69 100644 --- a/.gitignore +++ b/.gitignore @@ -81,7 +81,6 @@ bin/pixeltool* bin/qmake* bin/qdoc* bin/qt3to4* -bin/qtdemo* bin/qttracereplay* bin/rcc* bin/uic* |