Commit bcb4364f authored by Xavier's avatar Xavier

Merge branch 'master' into satcor_master

Conflicts:
	AndroidManifest.xml
parents c21243c2 77997d34
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="cs.si.satcor"
android:versionCode="1240"
android:versionName="1.2.4"
android:versionCode="1250"
android:versionName="1.2.5"
android:installLocation="auto" >
<!-- VersionCode: [3]version+[1]architecture e.g 1.0.2arm is 1020, 1.1.3x86 is 1131 -->
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment