Commit Graph

13 Commits

Author SHA1 Message Date
Steve f3956d370d Tidy headers update. 2016-05-12 12:20:16 +01:00
Steve 9063ec84a7 Removed duplicate externs from headers. 2016-05-06 16:14:41 +01:00
Steve b75c9a56b1 i18n updates. 2016-04-08 11:05:00 +01:00
Steve e278374490 Merge from develop. 2016-03-27 11:21:23 +01:00
Steve 91e0073cfa Merge branch 'develop' into trophies 2016-03-10 17:52:07 +00:00
Steve 26b6b3eb7e i18n updates. 2016-03-10 15:44:48 +00:00
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
Steve 831dbf2fdc Create POT with trophy info. 2016-03-09 15:55:01 +00:00
Steve 5f4fe28d22 i18n updates. 2016-03-06 09:48:55 +00:00
Steve 46b04ce6cd Added tidyHeaders to tools. 2016-02-29 16:06:04 +00:00
Steve e5e96f8e81 GPL notices. 2016-02-29 16:05:49 +00:00
Steve a7d3c811ba POT file updates. 2016-02-29 15:01:11 +00:00
Steve 44c7e78606 Further i18n integration updates. 2016-02-28 09:59:33 +00:00