changeset in /hg/icedtea: Fix remnants of doko's merge.

[Andrew John Hughes]

changeset 4c80afa670e8 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=4c80afa670e8
description:
	Fix remnants of doko's merge.

diffstat:

2 files changed, 7 deletions(-)
ChangeLog   |    3 ---
Makefile.am |    4 ----

diffs (35 lines):

diff -r fa456dbffc04 -r 4c80afa670e8 ChangeLog
--- a/ChangeLog	Thu Dec 04 14:09:57 2008 +0000
+++ b/ChangeLog	Thu Dec 04 14:24:01 2008 +0000
@@ -331,10 +331,7 @@ 2008-12-03  Gary Benson  <gbenson at redhat
 	* a/ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
 	(os::is_allocatable): Likewise.
 
-2008-12-03  Matthias Klose  <doko at ubuntu.com>
-=======
 2008-12-02  Matthias Klose  <doko at ubuntu.com>
->>>>>>> other
 
 	* patches/icedtea-format-warnings.patch: New.
 	* patches/icedtea-format-warnings.patch: Likewise.
diff -r fa456dbffc04 -r 4c80afa670e8 Makefile.am
--- a/Makefile.am	Thu Dec 04 14:09:57 2008 +0000
+++ b/Makefile.am	Thu Dec 04 14:24:01 2008 +0000
@@ -1874,7 +1874,6 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-display-mode-changer.patch \
 	patches/icedtea-testenv.patch \
 	patches/icedtea-format-warnings.patch \
-<<<<<<< local
 	patches/icedtea-fortify-source.patch \
 	$(ZERO_PATCHES_COND) \
 	patches/icedtea-samejvm-safe.patch \
@@ -1888,9 +1887,6 @@ ICEDTEA_PATCHES = \
         patches/security/icedtea-6734167.patch \
         patches/security/icedtea-6755943.patch \
         patches/security/icedtea-6766136.patch
-=======
-	$(ZERO_PATCHES_COND)
->>>>>>> other
 
 if WITH_RHINO
 ICEDTEA_PATCHES += \