Merge branch 'omp'

This commit is contained in:
mittorn
2016-08-11 07:44:30 +00:00
6 changed files with 71 additions and 9 deletions
+3 -3
View File
@@ -22,7 +22,7 @@
android:allowBackup="true"
android:hardwareAccelerated="true">
<!--<activity android:name="in.celest.xash3d.SteamActivity"
<activity android:name="in.celest.xash3d.SteamActivity"
android:label="Steam"
android:windowSoftInputMode="adjustResize"
android:launchMode="singleTask">
@@ -31,7 +31,7 @@
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>-->
</activity>
<activity android:name="in.celest.xash3d.LauncherActivity"
@@ -94,7 +94,7 @@
<data android:scheme="package" />
</intent-filter>
</receiver>
<!--<service android:name="in.celest.xash3d.SteamService" />-->
<service android:name="in.celest.xash3d.SteamService" />
</application>
<!-- Android 2.3 -->