tbftss/src
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
..
battle Merge remote-tracking branch 'origin/develop' into trophies 2016-03-10 12:04:04 +00:00
challenges Merge remote-tracking branch 'origin/develop' into trophies 2016-03-10 12:04:04 +00:00
draw Screenshot save path update. 2016-03-06 09:48:09 +00:00
galaxy Merge remote-tracking branch 'origin/develop' into trophies 2016-03-10 12:04:04 +00:00
game Merge remote-tracking branch 'origin/develop' into trophies 2016-03-10 12:04:04 +00:00
json Start of waypoints. 2015-10-26 17:27:43 +00:00
plat Screenshot save path update. 2016-03-06 09:48:09 +00:00
system Merge remote-tracking branch 'origin/develop' into trophies 2016-03-10 12:04:04 +00:00
test i18n updates. 2016-02-28 13:45:17 +00:00
common.h GPL notices. 2016-02-29 16:05:49 +00:00
defs.h Merge remote-tracking branch 'origin/develop' into trophies 2016-03-10 12:04:04 +00:00
main.c Screenshot save path update. 2016-03-06 09:48:09 +00:00
main.h Screenshot save path update. 2016-03-06 09:48:09 +00:00
structs.h Now automatically checking trophies based on star system name. 2016-03-09 15:54:25 +00:00