Merge branch 'trophies' of ssh://github.com/stephenjsweeney/tbftss into trophies

Browse Source

Conflicts:
	locale/tbftss.pot
	src/battle/battle.c
	src/battle/battle.h
	src/galaxy/mission.c

...

This commit is contained in:

Steve 2016-03-27 11:25:50 +01:00

parent 5d1edf89b3 1938c6714c

commit 147f2afae4

2 changed files with 5 additions and 5 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files