Merge branch 'release-0.4.2'

acolomb · Aug 14, 2015 · b84fc18 · b84fc18
2 parents 96de54f + 9935084
commit b84fc18
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,11 @@
+2015-08-14  André Colomb  <[email protected]>
+
+	* Fix segmentation fault when using Intel Hex files, caused by an
+	error in libcintelhex.  A newer pre-release of libcintelhex is now
+	referenced for the submodule.
+
+	* Release version 0.4.2
+
 2015-07-22  André Colomb  <[email protected]>
 
 	* Fix README.md syntax compatibility for GitHub and include it in

diff --git a/configure.ac b/configure.ac
@@ -17,7 +17,7 @@
 # <http://www.gnu.org/licenses/>.
 
 
-AC_INIT([elf-mangle], [0.4.1], [[email protected]])
+AC_INIT([elf-mangle], [0.4.2], [[email protected]])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([src/elf-mangle.c])
 AC_CONFIG_AUX_DIR([.])

diff --git a/libcintelhex b/libcintelhex
+0 −3		.travis.yml
+1 −1		README.md
+14 −7		src/ihex_copy.c
+9 −2		src/ihex_parse.c
+51 −13		src/ihex_record.c