You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Jonathan G Rennison 0310fb0cdc Merge branch 'master' into jgrpp ... # Conflicts: # src/lang/czech.txt # src/lang/galician.txt # src/lang/german.txt # src/order_cmd.cpp # src/saveload/afterload.cpp # src/ship.h # src/vehicle.cpp		2 years ago
..
CMakeLists.txt	…
grf.cpp	Merge branch 'master' into jgrpp	2 years ago
grf.hpp	Fix #9804: Only apply sprite_zoom_min setting when sprites available (#9988)	2 years ago
sprite_file.cpp	…
sprite_file_type.hpp	Implement custom sprite detection with new sprite mechanism	3 years ago
spriteloader.hpp	Fix #9804: Only apply sprite_zoom_min setting when sprites available (#9988)	2 years ago