# HG changeset patch
# User Deepak Bhole <dbhole@redhat.com>
# Date 1319837333 14400
# Node ID 452aa7fc0e7f94176fbfc4dfa9273897b70067e1
# Parent  e1040ab7de28a800e5da1bd6012ce78f0893e3d5
Prepare for 1.1.5

diff -r e1040ab7de28 -r 452aa7fc0e7f ChangeLog
--- a/ChangeLog	Tue Nov 08 10:59:16 2011 -0500
+++ b/ChangeLog	Fri Oct 28 17:28:53 2011 -0400
@@ -1,3 +1,8 @@
+2011-09-28  Deepak Bhole <dbhole@redhat.com>
+
+	* NEWS: Prepare for 1.1.5
+	* configure.ac: Same
+
 2011-10-28  Deepak Bhole <dbhole@redhat.com>
 
 	* NEWS: Prepare to release 1.1.4
diff -r e1040ab7de28 -r 452aa7fc0e7f NEWS
--- a/NEWS	Tue Nov 08 10:59:16 2011 -0500
+++ b/NEWS	Fri Oct 28 17:28:53 2011 -0400
@@ -8,6 +8,8 @@
 
 CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
 
+New in release 1.1.5 (2011-XX-XX):
+
 New in release 1.1.4 (2011-11-08):
 * Security updates:
   - RH742515, CVE-2011-3377: IcedTea-Web: second-level domain subdomains and suffix domain SOP bypass
diff -r e1040ab7de28 -r 452aa7fc0e7f configure.ac
--- a/configure.ac	Tue Nov 08 10:59:16 2011 -0500
+++ b/configure.ac	Fri Oct 28 17:28:53 2011 -0400
@@ -1,4 +1,4 @@
-AC_INIT([icedtea-web],[1.1.4],[distro-pkg-dev@openjdk.java.net], [icedtea-web], [http://icedtea.classpath.org/wiki/IcedTea-Web])
+AC_INIT([icedtea-web],[1.1.5pre],[distro-pkg-dev@openjdk.java.net], [icedtea-web], [http://icedtea.classpath.org/wiki/IcedTea-Web])
 AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
 AC_CONFIG_FILES([Makefile netx.manifest])