summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@theqtcompany.com>2015-06-23 10:23:29 +0200
committerEike Ziller <eike.ziller@theqtcompany.com>2015-06-23 10:23:29 +0200
commit1299d0469a580b598747a3b2851005634d482421 (patch)
tree92e4850744dc36bd174378f2f3e1334996945c97
parent66fd4845f53e5cbb56fba13726edf094486ae047 (diff)
parentf43c685270b41ea173070d5a8765781a0502cecc (diff)
Merge remote-tracking branch 'origin/3.4'
-rw-r--r--win32/lib/qtcreatorcdbext64/qtcreatorcdbext.dllbin699392 -> 695808 bytes
-rw-r--r--win32/lib/vcredist_msvc2010/vcredist_x86.exebin8990552 -> 0 bytes
-rw-r--r--win32/lib/vcredist_msvc2013/vcredist_x86.exebin0 -> 6503984 bytes
-rw-r--r--win64/lib/vcredist_msvc2010_64/vcredist_x64.exebin10274136 -> 0 bytes
4 files changed, 0 insertions, 0 deletions
diff --git a/win32/lib/qtcreatorcdbext64/qtcreatorcdbext.dll b/win32/lib/qtcreatorcdbext64/qtcreatorcdbext.dll
index 87f7b66..69512a6 100644
--- a/win32/lib/qtcreatorcdbext64/qtcreatorcdbext.dll
+++ b/win32/lib/qtcreatorcdbext64/qtcreatorcdbext.dll
Binary files differ
diff --git a/win32/lib/vcredist_msvc2010/vcredist_x86.exe b/win32/lib/vcredist_msvc2010/vcredist_x86.exe
deleted file mode 100644
index 9c1dfdd..0000000
--- a/win32/lib/vcredist_msvc2010/vcredist_x86.exe
+++ /dev/null
Binary files differ
diff --git a/win32/lib/vcredist_msvc2013/vcredist_x86.exe b/win32/lib/vcredist_msvc2013/vcredist_x86.exe
new file mode 100644
index 0000000..b795578
--- /dev/null
+++ b/win32/lib/vcredist_msvc2013/vcredist_x86.exe
Binary files differ
diff --git a/win64/lib/vcredist_msvc2010_64/vcredist_x64.exe b/win64/lib/vcredist_msvc2010_64/vcredist_x64.exe
deleted file mode 100644
index 2b3da3b..0000000
--- a/win64/lib/vcredist_msvc2010_64/vcredist_x64.exe
+++ /dev/null
Binary files differ