]> www.infradead.org Git - users/mchehab/andors-trail.git/commit
Merge branch 'itemcategories'
authorOskar Wiksten <oskar.wiksten@gmail.com>
Sun, 7 Oct 2012 16:18:35 +0000 (18:18 +0200)
committerOskar Wiksten <oskar.wiksten@gmail.com>
Sun, 7 Oct 2012 16:18:35 +0000 (18:18 +0200)
commit69ca9ec3af3c34ccbf36828731c68571ab22065f
tree9e74b0ebf007840fb4181add9b46256c70f9454c
parent7aedeae7baf697fddd54372b22f65b22d694dd58
parent3b6e98781c020b9c9e2294716deb29267e46bc79
Merge branch 'itemcategories'
AndorsTrail/res/values/strings.xml
AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ActorStatsController.java
AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ItemController.java
AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ResourceLoader.java