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.
OpenTTD-patches/src/spriteloader
Jonathan G Rennison cbdd9f84d8 Merge branch 'master' into jgrpp
# Conflicts:
#	src/console_gui.cpp
#	src/lang/korean.txt
#	src/video/sdl2_v.cpp
#	src/video/sdl2_v.h
#	src/window.cpp
#	src/window_gui.h
5 years ago
..
grf.cpp Merge branch 'master' into jgrpp 5 years ago
grf.hpp Merge branch 'master' into jgrpp 5 years ago
spriteloader.hpp Merge branch 'master' into jgrpp 5 years ago