Mercurial > hg > release > icedtea6-1.12

changeset 2720:3885df4d608f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author aph
date Fri, 28 Oct 2011 14:52:52 +0100
parents 8ac014b1879d
children 26bdb437215d
files ChangeLog
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Oct 28 09:43:24 2011 -0400
+++ b/ChangeLog	Fri Oct 28 14:52:52 2011 +0100
@@ -1,3 +1,7 @@
+2011-10-28  Andrew Haley  <aph@redhat.com>
+
+	* Makefile.am (ICEDTEA_PATCHES): Add patches/arm-debug.patch.
+
 2011-10-27  Andrew Haley  <aph@redhat.com>
 
 	* arm_port/hotspot/src/cpu/zero/vm/asm_helper.cpp (whole file):
@@ -6,10 +10,6 @@
 	* arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp: Likewise.
 	* patches/arm.patch: Move %.S rule outside ARM conditional.
 
-2011-10-28  Andrew Haley  <aph@redhat.com>
-
-	* Makefile.am (ICEDTEA_PATCHES): Add patches/arm-debug.patch.
-
 2011-10-26  Andrew Haley  <aph@redhat.com>
 
 	* patches/arm.patch (CFLAGS): Enable the ARM assembler port.