Merge branch 'traits_refactoring'

author Oskar Wiksten <oskar.wiksten@gmail.com>

Sun, 7 Oct 2012 16:19:44 +0000 (18:19 +0200)

committer Oskar Wiksten <oskar.wiksten@gmail.com>

Sun, 7 Oct 2012 16:19:44 +0000 (18:19 +0200)
author Oskar Wiksten <oskar.wiksten@gmail.com>
Sun, 7 Oct 2012 16:19:44 +0000 (18:19 +0200)
committer Oskar Wiksten <oskar.wiksten@gmail.com>
Sun, 7 Oct 2012 16:19:44 +0000 (18:19 +0200)
diff --cc AndorsTrail/res/values/strings.xml
Simple merge
diff --cc AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ActorStatsController.java
Simple merge
diff --cc AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ItemController.java
Simple merge
author	Oskar Wiksten <oskar.wiksten@gmail.com>
	Sun, 7 Oct 2012 16:19:44 +0000 (18:19 +0200)
committer	Oskar Wiksten <oskar.wiksten@gmail.com>
	Sun, 7 Oct 2012 16:19:44 +0000 (18:19 +0200)
		1	2
AndorsTrail/res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history
AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ActorStatsController.java	patch \|	diff1 \|	diff2 \|	blob \| history
AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ItemController.java	patch \|	diff1 \|	diff2 \|	blob \| history