]> www.infradead.org Git - users/mchehab/andors-trail.git/commit
Merge branch 'worldmap'
authorOskar Wiksten <oskar.wiksten@gmail.com>
Sun, 7 Oct 2012 16:17:53 +0000 (18:17 +0200)
committerOskar Wiksten <oskar.wiksten@gmail.com>
Sun, 7 Oct 2012 16:17:53 +0000 (18:17 +0200)
commit7aedeae7baf697fddd54372b22f65b22d694dd58
treee2841dae5a5be6e1d5826ce9c04457220ea5622e
parent0c585917b5366f536e344a8bfeef0a657dbf99e1
parent603d682a826a899ebd13a6e455ae1e6740178579
Merge branch 'worldmap'

Conflicts:
AndorsTrail/res/values/strings.xml
AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MainActivity.java
AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java
AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/StatusView.java
AndorsTrail/res/layout/main.xml
AndorsTrail/res/values/strings.xml
AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MainActivity.java
AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/GameRoundController.java
AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MovementController.java
AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/StatusView.java