From ff2d3c6fab3e29d967e7c619c177dfd543850c07 Mon Sep 17 00:00:00 2001
From: YuviPanda <yuvipanda@gmail.com>
Date: Mon, 30 Jan 2012 20:21:08 -0800
Subject: [PATCH] Bumped version to v1.1-alpha. Added CHANGELOG

---
 AndroidManifest.xml   |  4 ++--
 CHANGELOG             | 18 ++++++++++++++++++
 assets/www/index.html |  2 +-
 3 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 CHANGELOG

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e5a97e04..efa4ee4c 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 		package="org.wikipedia" 
-		android:versionCode="1" 
-		android:versionName="1.0"
+		android:versionCode="4" 
+		android:versionName="1.1alpha1"
 		android:installLocation="auto">
 	<supports-screens android:xlargeScreens="true" android:largeScreens="true"
 		android:normalScreens="true" android:smallScreens="true"
diff --git a/CHANGELOG b/CHANGELOG
new file mode 100644
index 00000000..2dd4f94d
--- /dev/null
+++ b/CHANGELOG
@@ -0,0 +1,18 @@
+# CHANGELOG
+
+## v1.1 ##
+
+- Integration with QuickSearch in Android
+- Open Wikipedia links from other apps in the Wikipedia App
+- OSM replaced Google Maps for nearby view
+- Added Did You Mean? to search results
+- Moved to jQuery off Zepto
+- Touching co-ordinates inside articles shows map overlay
+- Full text search 
+- Added 'Clear History'
+- Added 'Clear Saved Pages'
+- Localized a few messages that were missing
+- Enable app to be saved to SD card
+- Major code-refactor, still needs more love :)
+- Improved tablet experienced
+- Move to using Hogan.js for templating
diff --git a/assets/www/index.html b/assets/www/index.html
index 347d58f1..bc2db797 100644
--- a/assets/www/index.html
+++ b/assets/www/index.html
@@ -183,7 +183,7 @@
 		<div class="scroller">
 			<div id="about-page-content">
 				<img src="image/logo.png" />
-				<p id="about-version"><msg key="about-version"></msg> 1.0</p>
+				<p id="about-version"><msg key="about-version"></msg> 1.1-alpha1</p>
 				<a id="about-wmf-logo" href="http://wikimediafoundation.org/"><img src="image/wmf.png" /></a>
 				<p id="about-copyright"><msg key="about-copyright"></msg></p>
 				<p id="about-license"><msg key="about-license"></msg></p>