# HG changeset patch
# User Andrew John Hughes <ahughes@redhat.com>
# Date 1243613477 -3600
# Node ID 9729b3a513055efc33f1220e3c8cd372afdf74d9
# Parent  8ae4bc2b6c1ded36c514e6ccc12f27f6d80fbaf8
Bump to 1.10, remove the netx alias target as it conflicts with the directory.

2009-05-27  Andrew John Hughes  <ahughes@redhat.com>

	* Makefile.am:
	Remove netx target as conflicts with
	directory when building in the source tree.
	* configure.ac:
	Bump to 1.10 proper.

diff -r 8ae4bc2b6c1d -r 9729b3a51305 ChangeLog
--- a/ChangeLog	Fri May 29 17:04:53 2009 +0100
+++ b/ChangeLog	Fri May 29 17:11:17 2009 +0100
@@ -1,3 +1,11 @@
+2009-05-27  Andrew John Hughes  <ahughes@redhat.com>
+
+	* Makefile.am:
+	Remove netx target as conflicts with
+	directory when building in the source tree.
+	* configure.ac:
+	Bump to 1.10 proper.
+
 2009-05-27  Andrew John Hughes  <ahughes@redhat.com>
 
 	* NEWS:
diff -r 8ae4bc2b6c1d -r 9729b3a51305 Makefile.am
--- a/Makefile.am	Fri May 29 17:04:53 2009 +0100
+++ b/Makefile.am	Fri May 29 17:11:17 2009 +0100
@@ -3739,8 +3739,6 @@
 
 jtreg: stamps/jtreg.stamp
 
-netx: stamps/netx.stamp
-
 netx-dist: stamps/netx-dist.stamp
 
 liveconnect: stamps/liveconnect.stamp
diff -r 8ae4bc2b6c1d -r 9729b3a51305 configure.ac
--- a/configure.ac	Fri May 29 17:04:53 2009 +0100
+++ b/configure.ac	Fri May 29 17:11:17 2009 +0100
@@ -1,4 +1,4 @@
-AC_INIT([icedtea], [1.10-pre], [distro-pkg-dev@openjdk.java.net])
+AC_INIT([icedtea], [1.10], [distro-pkg-dev@openjdk.java.net])
 AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
 AC_CONFIG_FILES([Makefile])