Sweeney
|
1938c6714c
|
Merge remote-tracking branch 'origin/develop' into trophies
# Conflicts:
# data/challenges/10.json
# locale/tbftss.pot
# src/battle/battle.c
# src/battle/battle.h
# src/battle/script.h
# src/galaxy/mission.c
|
2016-03-15 12:19:32 +00:00 |
Steve
|
ad96a70b0a
|
i18n updates.
|
2016-03-13 10:54:50 +00: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 |