]> www.infradead.org Git - users/mchehab/andors-trail.git/commit
Merge branch 'traits_refactoring'
authorOskar Wiksten <oskar.wiksten@gmail.com>
Sun, 7 Oct 2012 16:19:44 +0000 (18:19 +0200)
committerOskar Wiksten <oskar.wiksten@gmail.com>
Sun, 7 Oct 2012 16:19:44 +0000 (18:19 +0200)
commitb881b6c15d3892c6452a597d7d0b3426e5f8facb
tree70c57f15800bfb9b5ef41877a0f495358491f070
parent69ca9ec3af3c34ccbf36828731c68571ab22065f
parent534148431e873f413bd044de81e9439588033c15
Merge branch 'traits_refactoring'
AndorsTrail/res/values/strings.xml
AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ActorStatsController.java
AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ItemController.java