Merge branch 'master' into android_login

This commit is contained in:
Felix Kloft
2013-05-15 11:56:08 +02:00
8 changed files with 71 additions and 22 deletions

View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.cradle.iitc_mobile"
android:versionCode="18"
android:versionName="0.3.6" >
android:versionCode="19"
android:versionName="0.3.7" >
<uses-sdk
android:minSdkVersion="14"