Merge remote-tracking branch 'google/master'

Conflicts: AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java
2026-01-17 17:17:08 +01:00 · 2014-04-23 00:47:59 +02:00
parent 624bd19aa9 2240a9e26b
commit 7a02014e1b
4 changed files with 4 additions and 2 deletions
--- a/AndorsTrail/AndroidManifest.xml
+++ b/AndorsTrail/AndroidManifest.xml
@@ -4,7 +4,7 @@
 	xmlns:android="http://schemas.android.com/apk/res/android" 
 	package="com.gpl.rpg.AndorsTrail"
 	android:versionCode="42"
-	android:versionName="0.7.1"
+	android:versionName="0.7.2dev"
 	android:installLocation="auto"
 	>
 	<uses-sdk 
--- a/AndorsTrail/assets/translation/.gitignore
+++ b/AndorsTrail/assets/translation/.gitignore
@@ -1 +1,2 @@
 *.mo
+/de.po
--- a/AndorsTrail/res/xml/template.tmx
+++ b/AndorsTrail/res/xml/template.tmx
@@ -203,4 +203,5 @@
 <objectgroup name="Mapevents" width="30" height="30"/>
 <objectgroup name="Spawn" width="30" height="30"/>
 <objectgroup name="Keys" width="30" height="30"/>
+ <objectgroup name="Replace" width="30" height="30"/>
 </map>
--- a/AndorsTrailEdit/editor.html
+++ b/AndorsTrailEdit/editor.html
@@ -15,7 +15,7 @@
 	<div class="andorsTrailLogo" id="title">
 		Andor's Trail Content Editor
 		<span id="version">
-			v0.7.1dev
+			v0.7.2dev
 		</span>
 	</div>
 	<div id="buttons">