Steve e8d63df494 Merge remote-tracking branch 'origin/develop' into trophies ... # Conflicts: # src/battle/battle.c # src/challenges/challengeHome.c		2016-03-10 12:04:04 +00:00
..
createPOT.sh	Merge remote-tracking branch 'origin/develop' into trophies	2016-03-10 12:04:04 +00:00
potHeader.txt	Further i18n integration updates.	2016-02-28 09:59:33 +00:00
tidyHeaders.sh	Added tidyHeaders to tools.	2016-02-29 16:06:04 +00:00