From 09ded423073f1a022721d0847f57bc66a3c09a50 Mon Sep 17 00:00:00 2001
From: Andreas Schildbach <andreas@schildbach.de>
Date: Tue, 20 Aug 2013 15:51:34 +0200
Subject: [PATCH] 3.18

---
 wallet/AndroidManifest.xml | 4 ++--
 wallet/CHANGES             | 7 +++++++
 wallet/pom.xml             | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/wallet/AndroidManifest.xml b/wallet/AndroidManifest.xml
index a6084937b5..8aae2db8cd 100644
--- a/wallet/AndroidManifest.xml
+++ b/wallet/AndroidManifest.xml
@@ -3,8 +3,8 @@
 	xmlns:tools="http://schemas.android.com/tools"
 	package="de.schildbach.wallet_test"
 	android:installLocation="internalOnly"
-	android:versionCode="138"
-	android:versionName="3.17-test" >
+	android:versionCode="139"
+	android:versionName="3.18-test" >
 
 	<uses-sdk
 		android:minSdkVersion="10"
diff --git a/wallet/CHANGES b/wallet/CHANGES
index 868c7886ca..f87c5ba691 100644
--- a/wallet/CHANGES
+++ b/wallet/CHANGES
@@ -6,6 +6,13 @@ keep your old backups around just in case.
 More info: http://bitcoin.org/en/alert/2013-08-11-android
 
 
+v3.18
+
+* Indonesian translation
+* bluetooth offline transactions
+* revamp of qr-code and nfc based offline transactions
+* remove transaction details screen, link to blockexplorer.com instead
+
 v3.17
 
 * fixed issue with emptying wallet
diff --git a/wallet/pom.xml b/wallet/pom.xml
index 27e9e7c269..792474b528 100644
--- a/wallet/pom.xml
+++ b/wallet/pom.xml
@@ -6,7 +6,7 @@
 
 	<artifactId>wallet</artifactId>
 	<packaging>apk</packaging>
-	<version>3.17-test</version>
+	<version>3.18-test</version>
 	<name>Bitcoin Wallet</name>
 
 	<parent>