Merge branch '#324' into tic_0.47.0
This commit is contained in:
		@@ -4,12 +4,12 @@
 | 
				
			|||||||
-->
 | 
					-->
 | 
				
			||||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
 | 
					<manifest xmlns:android="http://schemas.android.com/apk/res/android"
 | 
				
			||||||
      package="com.nesbox.tic"
 | 
					      package="com.nesbox.tic"
 | 
				
			||||||
      android:versionCode="4601"
 | 
					      android:versionCode="4602"
 | 
				
			||||||
      android:versionName="0.46.1"
 | 
					      android:versionName="0.46.2"
 | 
				
			||||||
      android:installLocation="auto">
 | 
					      android:installLocation="auto">
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    <!-- Android 2.3.3 -->
 | 
					    <!-- Android 2.3.3 -->
 | 
				
			||||||
    <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="14" />
 | 
					    <uses-sdk android:minSdkVersion="12" android:targetSdkVersion="12" />
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    <!-- OpenGL ES 2.0 -->
 | 
					    <!-- OpenGL ES 2.0 -->
 | 
				
			||||||
    <uses-feature android:glEsVersion="0x00020000" />
 | 
					    <uses-feature android:glEsVersion="0x00020000" />
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -11,4 +11,4 @@
 | 
				
			|||||||
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 | 
					#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Project target.
 | 
					# Project target.
 | 
				
			||||||
target=android-14
 | 
					target=android-12
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user