Merge branch 'master' into develop

Browse Source

Conflicts:
	CHANGELOG
	common.mk
	src/galaxy/starSystems.c

...

This commit is contained in:

Steve 2016-03-06 21:53:07 +00:00

parent 244e5d6dd9 2c5cb1cd0b

commit f6239903f7

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

Diff Content Not Available