Mercurial > hg > release > icedtea-1.10
changeset 1819:d91c81a1cebc
Merge.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Thu, 21 May 2009 20:03:37 +0100 |
| parents | c2f4a7906024 (current diff) cf06793370fe (diff) |
| children | 082075fb775e |
| files | ChangeLog |
| diffstat | 2 files changed, 24 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- 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: regexp configure +missing aclocal.m4 autom4te.cache cacao @@ -461,6 +462,20 @@ 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 pulse-java.jar hotspot.tar.gz +corba.tar.gz +jaxp.tar.gz +jaxws.tar.gz +jdk.tar.gz +langtools.tar.gz
--- a/ChangeLog Thu May 21 20:02:36 2009 +0100 +++ b/ChangeLog Thu May 21 20:03:37 2009 +0100 @@ -5,6 +5,10 @@ * generated/sun/awt/X11/generator/sizes.64: Added missing generated files. +2009-05-21 Lillian Angel <langel@redhat.com> + + * .hgignore: Updated. + 2009-05-21 Andrew John Hughes <ahughes@redhat.com> * Makefile.am: