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/contrib/flex/2.5.4a/flex-2.5.4a/depends-GnuWin32.lst | |
| 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/contrib/flex/2.5.4a/flex-2.5.4a/depends-GnuWin32.lst')
| -rw-r--r-- | gnuwin32/contrib/flex/2.5.4a/flex-2.5.4a/depends-GnuWin32.lst | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/gnuwin32/contrib/flex/2.5.4a/flex-2.5.4a/depends-GnuWin32.lst b/gnuwin32/contrib/flex/2.5.4a/flex-2.5.4a/depends-GnuWin32.lst deleted file mode 100644 index 972dbc1b..00000000 --- a/gnuwin32/contrib/flex/2.5.4a/flex-2.5.4a/depends-GnuWin32.lst +++ /dev/null @@ -1,3 +0,0 @@ -kernel32.dll -msvcrt.dll -ntdll.dll |