Merge branch 'develop'

2014-06-26 18:33:30 -04:30 · 2014-05-27 14:51:24 -04:30 · 2014-05-15 12:14:03 -04:30 · 2014-04-04 10:29:28 -04:30 · 2014-03-14 15:18:39 -04:30 · 2014-02-11 17:50:46 -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="140716"
-    android:versionName="14.07.16" >
+    android:versionCode="140626"
+    android:versionName="14.06.26" >

    <uses-sdk android:minSdkVersion="12" android:targetSdkVersion="19" />
Author	SHA1	Message	Date
unknown	915187816f	Merge branch 'develop'	2014-06-26 18:33:30 -04:30
unknown	5ec478c8cd	Merge branch 'develop'	2014-05-27 14:51:24 -04:30
unknown	1a2017a65f	Merge branch 'develop'	2014-05-15 12:14:03 -04:30
unknown	daaace0d3f	Merge branch 'develop'	2014-04-04 10:29:28 -04:30
unknown	7ac89881a3	Merge branch 'develop'	2014-03-14 15:18:39 -04:30
unknown	ed84d124d5	Merge branch 'develop'	2014-02-11 17:50:46 -04:30
Miguel Astor	33f3d7b7b9	Merge branch 'release-14.01.10'	2014-01-09 08:26:42 -04:30