Merge branch 'develop'

Changed version number.
Added a readme file.
2014-04-04 10:29:28 -04:30 · 2014-04-04 10:29:05 -04:30 · 2014-03-31 11:03:20 -04:30 · 2014-03-18 18:04:38 -04:30
3 changed files with 7 additions and 3 deletions
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -17,8 +17,8 @@
 <!-- android:screenOrientation="portrait" -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
    package="ve.ucv.ciens.ccg.nxtar"
-    android:versionCode="1"
-    android:versionName="1.0" >
+    android:versionCode="140404"
+    android:versionName="14.04.04" >

    <uses-sdk android:minSdkVersion="12" android:targetSdkVersion="19" />

--- a/README.md
+++ b/README.md
@@ -0,0 +1,4 @@
+NxtAR-android
+=============
+
+Modulo 2 de mi trabajo especial de grado.
Author	SHA1	Message	Date
unknown	daaace0d3f	Merge branch 'develop'	2014-04-04 10:29:28 -04:30
unknown	00038f1622	Changed version number.	2014-04-04 10:29:05 -04:30
unknown	72eb8d2731	Added a readme file.	2014-03-31 11:03:20 -04:30
unknown	36e34d3b2f	Source formatting.	2014-03-18 18:04:38 -04:30