aboutsummaryrefslogtreecommitdiffstats
path: root/gnuwin32/contrib/flex/2.5.4a/flex-2.5.4a/depends-GnuWin32.lst
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2015-08-24 16:18:23 +0200
committerLiang Qi <liang.qi@theqtcompany.com>2015-08-24 16:18:23 +0200
commitc9425926e13fcfbd8fe5b69d658fadab928f1d16 (patch)
tree05e7f0ed43882bd9f8dd30ecd38df25906f45656 /gnuwin32/contrib/flex/2.5.4a/flex-2.5.4a/depends-GnuWin32.lst
parentf587983764be7d127305d350c76702b7e28ea0f1 (diff)
parent56e7af096e889d56ef67baabf38529c0ccb8d8b5 (diff)
Merge remote-tracking branch 'origin/5.5' into 5.6
Conflicts: qt3d qtactiveqt qtandroidextras qtbase qtcanvas3d qtconnectivity qtdeclarative qtdoc qtenginio qtgraphicaleffects qtimageformats qtlocation qtmacextras qtmultimedia qtqa qtquick1 qtquickcontrols qtrepotools qtscript qtsensors qtserialport qtsvg qttools qttranslations qtwayland qtwebchannel qtwebengine qtwebkit qtwebkit-examples qtwebsockets qtwinextras qtx11extras qtxmlpatterns Change-Id: I7410d9be5775ab276fb5a57adb397f4f92d77a50
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.lst3
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