# HG changeset patch
# User Jonas Hultén <jonas@kollektivet.nu>
# Date 1634834785 -7200
#      Thu Oct 21 18:46:25 2021 +0200
# Branch develop
# Node ID c784e6544f6ae80f7cdf29d4a9aa94b75507467b
# Parent  5f2f4e456de7b2f90addbeebbef47ab8116ebe16
# Parent  52e7c4790e0b073f577d118f43fd0785c73ccc6b
Merge with default

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -1,1 +1,9 @@
 f7c4f5b70ca566d72c662a10379652cb359c31eb version_1.22
+7c0ef7aebb5f7af9ec138ecbc04790ce24ac59cb version_1.23
+513779c7449701e5a61dd96cdd4f840678a8690b version_1.24
+e447030ba9feed94c79bde30c4f27bcc632faab4 version_1.25
+b880425ea34c31eb87b52834502cc1f0251a18e6 version_1.26
+fd2e5ddd8245bd2bf536a8314b8e0da74e931fd9 version_1.27
+623723ab9e348d44e09f6abd6a8d27bb2332831a version_1.28
+97c4baa181af787fe7da475556ebc5e4f6d89610 version_1.29
+5a17bdbc9b0761db92c0c7700e7a84617703aa5f version_1.30
diff --git a/jasm/CMakeLists.txt b/jasm/CMakeLists.txt
--- a/jasm/CMakeLists.txt
+++ b/jasm/CMakeLists.txt
@@ -27,8 +27,8 @@
 
 if (${MINGW})
 	add_custom_command(TARGET jasm POST_BUILD
-		COMMAND ${CMAKE_COMMAND} -E copy_if_different "/usr/lib/gcc/x86_64-w64-mingw32/7.3-win32/libgcc_s_seh-1.dll" $<TARGET_FILE_DIR:jasm>
-		COMMAND ${CMAKE_COMMAND} -E copy_if_different "/usr/lib/gcc/x86_64-w64-mingw32/7.3-win32/libstdc++-6.dll" $<TARGET_FILE_DIR:jasm>
+		COMMAND ${CMAKE_COMMAND} -E copy_if_different "/usr/lib/gcc/x86_64-w64-mingw32/9.3-win32/libgcc_s_seh-1.dll" $<TARGET_FILE_DIR:jasm>
+		COMMAND ${CMAKE_COMMAND} -E copy_if_different "/usr/lib/gcc/x86_64-w64-mingw32/9.3-win32/libstdc++-6.dll" $<TARGET_FILE_DIR:jasm>
 	)
 endif()
 
diff --git a/jasm/website/site/index.html b/jasm/website/site/index.html
--- a/jasm/website/site/index.html
+++ b/jasm/website/site/index.html
@@ -122,10 +122,14 @@
 				<ul>
 					<li>
 						<a href="binaries/jasm_1.30_linux64.7z">jAsm 1.30 for 64-bit Linux</a>
+					</li>
+					<li>
 						<a href="binaries/jasm_1.29_linux64.7z">jAsm 1.29 for 64-bit Linux</a>
 					</li>
 					<li>
 						<a href="binaries/jasm_1.30_win64.7z">jAsm 1.30 for 64-bit Windows</a>
+					</li>
+					<li>
 						<a href="binaries/jasm_1.29_win64.7z">jAsm 1.29 for 64-bit Windows</a>
 					</li>
 				</ul>
diff --git a/release.py b/release.py
--- a/release.py
+++ b/release.py
@@ -55,7 +55,7 @@
 		if error_code != 0:
 			raise Exception("Failed to compress")
 		os.chdir("..")
-		error_code = run(["7z", "a", "../jasm/website/site/binaries/jasm_%s_win64.7z" % version, "/usr/lib/gcc/x86_64-w64-mingw32/7.3-win32/libgcc_s_seh-1.dll", "/usr/lib/gcc/x86_64-w64-mingw32/7.3-win32/libstdc++-6.dll"])
+		error_code = run(["7z", "a", "../jasm/website/site/binaries/jasm_%s_win64.7z" % version, "/usr/lib/gcc/x86_64-w64-mingw32/9.3-win32/libgcc_s_seh-1.dll", "/usr/lib/gcc/x86_64-w64-mingw32/9.3-win32/libstdc++-6.dll"])
 		if error_code != 0:
 			raise Exception("Failed to compress")
 	finally: