diff options
author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-09-18 12:00:07 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-09-18 12:00:07 +0200 |
commit | 2068af50ca9eb8895e34cb60f67942e100c60432 (patch) | |
tree | 31c5f51e2bcb74b660fe4013f29c417e71215012 /gnuwin32/manifest/bison-2.4.1-dep.mft | |
parent | 1d3966833b5f27fb262f2d3727557ef2c8947828 (diff) | |
parent | 2ebfdb4ca80f6738c2720cb261c19fecd65b8b62 (diff) |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
.gitmodules
qtquickcontrols2
qtwebview
Change-Id: Ic5b78f36511d5e022aacd6ade5d052345bc84d14
Diffstat (limited to 'gnuwin32/manifest/bison-2.4.1-dep.mft')
-rw-r--r-- | gnuwin32/manifest/bison-2.4.1-dep.mft | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/gnuwin32/manifest/bison-2.4.1-dep.mft b/gnuwin32/manifest/bison-2.4.1-dep.mft deleted file mode 100644 index fb54cc84..00000000 --- a/gnuwin32/manifest/bison-2.4.1-dep.mft +++ /dev/null @@ -1,5 +0,0 @@ -bin/libiconv2.dll -bin/libintl3.dll -bin/regex2.dll -manifest/bison-2.4.1-dep.mft -manifest/bison-2.4.1-dep.ver bb151d843339f90abdc34f5eb49bff0e |