Commit Graph

1 Commits (991b7a958e8b4fd2dd4e54e7384d62c932ffa16b)

Author SHA1 Message Date
Jonathan G Rennison 5a28405ced Merge branch 'master' into jgrpp
# Conflicts:
#	src/company_gui.cpp
#	src/group_gui.cpp
#	src/newgrf.cpp
#	src/newgrf_debug_gui.cpp
#	src/saveload/saveload.cpp
10 months ago