Merge branch 'develop'

Updated the version number.
2014-07-16 09:37:54 -04:30 · 2014-07-16 09:37:33 -04:30 · 2014-07-01 10:18:04 -04:30 · 2014-07-01 10:17:48 -04:30
1 changed files with 2 additions and 2 deletions
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -16,8 +16,8 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
    package="ve.ucv.ciens.ccg.nxtar"
-    android:versionCode="140626"
-    android:versionName="14.06.26" >
+    android:versionCode="140716"
+    android:versionName="14.07.16" >

    <uses-sdk android:minSdkVersion="12" android:targetSdkVersion="19" />
Author	SHA1	Message	Date
unknown	4bd1ba84c3	Merge branch 'develop'	2014-07-16 09:37:54 -04:30
unknown	019b42c738	Updated the version number.	2014-07-16 09:37:33 -04:30
unknown	30648b6df1	Merge branch 'develop'	2014-07-01 10:18:04 -04:30
unknown	d3c26c12b4	Updated version number.	2014-07-01 10:17:48 -04:30