summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@theqtcompany.com>2015-06-29 09:56:17 +0200
committerEike Ziller <eike.ziller@theqtcompany.com>2015-06-29 10:19:41 +0000
commit4660d10981b3539d3be701a139ab4ca96e2ffb98 (patch)
treecfcfe995050da739239fd1935894f4d79a53c919
parent1299d0469a580b598747a3b2851005634d482421 (diff)
update jom to v1.0.16v3.5.13.5
Task-number: QTCREATORBUG-14612 Change-Id: I7970d7b5c02b1c37ae51e9cd3516fe809aedb323 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
-rw-r--r--win32/bin/changelog.jom.txt5
-rw-r--r--win32/bin/jom.exebin2467840 -> 2467840 bytes
2 files changed, 4 insertions, 1 deletions
diff --git a/win32/bin/changelog.jom.txt b/win32/bin/changelog.jom.txt
index 2e3cf18..a5d44a9 100644
--- a/win32/bin/changelog.jom.txt
+++ b/win32/bin/changelog.jom.txt
@@ -1,4 +1,7 @@
-This is the changelog for jom 1.0.15, the parallel make tool.
+This is the changelog for jom 1.0.16, the parallel make tool.
+
+Changes since jom 1.0.15
+- Fix occasional hang on exit (QTCREATORBUG-14600).
Changes since jom 1.0.14
- Fix potential hang on error in a sub-jom.
diff --git a/win32/bin/jom.exe b/win32/bin/jom.exe
index f6d7ee9..7800eec 100644
--- a/win32/bin/jom.exe
+++ b/win32/bin/jom.exe
Binary files differ