changeset in /hg/icedtea: Merge.

[Andrew John Hughes]

changeset d91c81a1cebc in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=d91c81a1cebc
description:
	Merge.

diffstat:

2 files changed, 24 insertions(+)
.hgignore |   20 ++++++++++++++++++++
ChangeLog |    4 ++++

diffs (55 lines):

diff -r c2f4a7906024 -r d91c81a1cebc .hgignore
--- a/.hgignore	Thu May 21 20:02:36 2009 +0100
+++ b/.hgignore	Thu May 21 20:03:37 2009 +0100
@@ -3,6 +3,7 @@ syntax: glob
 
 syntax: regexp
 configure
+missing
 aclocal.m4
 autom4te.cache
 cacao
@@ -461,6 +462,20 @@ rt/netscape/javascript/JSProxy.java
 rt/netscape/javascript/JSProxy.java
 rt/netscape/javascript/JSRunnable.java
 rt/netscape/javascript/JSUtil.java
+rt/com/sun/net/httpserver/Authenticator.java
+rt/com/sun/net/httpserver/BasicAuthenticator.java
+rt/com/sun/net/httpserver/Filter.java
+rt/com/sun/net/httpserver/Headers.java
+rt/com/sun/net/httpserver/HttpContext.java
+rt/com/sun/net/httpserver/HttpExchange.java
+rt/com/sun/net/httpserver/HttpHandler.java
+rt/com/sun/net/httpserver/HttpPrincipal.java
+rt/com/sun/net/httpserver/HttpServer.java
+rt/com/sun/net/httpserver/HttpsConfigurator.java
+rt/com/sun/net/httpserver/HttpsExchange.java
+rt/com/sun/net/httpserver/HttpsParameters.java
+rt/com/sun/net/httpserver/HttpsServer.java
+rt/com/sun/net/httpserver/package-info.java
 generated/sun/awt/X11/generator/sizer.32.orig
 pulseaudio/bin
 pulseaudio/.*\.o
@@ -468,3 +483,8 @@ pulseaudio/.*jar
 pulseaudio/.*jar
 pulse-java.jar
 hotspot.tar.gz
+corba.tar.gz
+jaxp.tar.gz
+jaxws.tar.gz
+jdk.tar.gz
+langtools.tar.gz
diff -r c2f4a7906024 -r d91c81a1cebc ChangeLog
--- a/ChangeLog	Thu May 21 20:02:36 2009 +0100
+++ b/ChangeLog	Thu May 21 20:03:37 2009 +0100
@@ -4,6 +4,10 @@ 2009-05-21  Andrew John Hughes  <ahughes
 	* generated/sun/awt/X11/generator/sizer.64.c,
 	* generated/sun/awt/X11/generator/sizes.64:
 	Added missing generated files.
+
+2009-05-21  Lillian Angel  <langel at redhat.com>
+
+	* .hgignore: Updated.
 
 2009-05-21  Andrew John Hughes  <ahughes at redhat.com>