From cd561b30847e7daf50f0a31a89ee1f3f11d2f8e5 Mon Sep 17 00:00:00 2001
From: Rom Walton <romw@romwnet.org>
Date: Wed, 12 Jun 2013 14:09:38 -0400
Subject: [PATCH] - Tag for 7.1.15 release, all platforms
 client_release/7.1/7.1.15

---
 android/BOINC/AndroidManifest.xml | 4 ++--
 configure.ac                      | 2 +-
 version.h                         | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/android/BOINC/AndroidManifest.xml b/android/BOINC/AndroidManifest.xml
index 49087a3c55..fdadd6a28d 100644
--- a/android/BOINC/AndroidManifest.xml
+++ b/android/BOINC/AndroidManifest.xml
@@ -20,8 +20,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="edu.berkeley.boinc"
     
-    android:versionCode="9"
-    android:versionName="7.1.14"
+    android:versionCode="10"
+    android:versionName="7.1.15"
     
     android:installLocation="internalOnly" > <!-- installation on SD card would break boot receiver -->
 
diff --git a/configure.ac b/configure.ac
index ee0ef10bdd..70fe45882e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ dnl not sure exactly what the minimum version is (but 2.13 wont work)
 AC_PREREQ(2.58)
 
 dnl Set the BOINC version here.  You can also use the set-version script.
-AC_INIT(BOINC, 7.1.14)
+AC_INIT(BOINC, 7.1.15)
 AC_CONFIG_MACRO_DIR([m4])
 LIBBOINC_VERSION=`echo ${PACKAGE_VERSION} | sed 's/\./:/g'`
 AC_SUBST([LIBBOINC_VERSION])
diff --git a/version.h b/version.h
index e832a84232..1be40055c2 100644
--- a/version.h
+++ b/version.h
@@ -10,10 +10,10 @@
 #define BOINC_MINOR_VERSION 1
 
 /* Release part of BOINC version number */
-#define BOINC_RELEASE 14
+#define BOINC_RELEASE 15
 
 /* String representation of BOINC version number */
-#define BOINC_VERSION_STRING "7.1.14"
+#define BOINC_VERSION_STRING "7.1.15"
 
 /* Package is a pre-release (Alpha/Beta) package */
 #define BOINC_PRERELEASE 1
@@ -29,13 +29,13 @@
 #define PACKAGE_NAME "BOINC"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "BOINC 7.1.14"
+#define PACKAGE_STRING "BOINC 7.1.15"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "boinc"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "7.1.14"
+#define PACKAGE_VERSION "7.1.15"
 
 #endif /* #if (defined(_WIN32) || defined(__APPLE__)) */