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 e53998ec01 Merge branch 'master' into jgrpp
# Conflicts:
#	src/cheat_gui.cpp
#	src/industry_gui.cpp
#	src/linkgraph/linkgraphschedule.cpp
#	src/misc/getoptdata.h
#	src/music/dmusic.cpp
#	src/network/core/os_abstraction.cpp
#	src/newgrf_engine.cpp
#	src/openttd.cpp
#	src/order_gui.cpp
#	src/os/windows/win32.cpp
#	src/pathfinder/npf/queue.cpp
#	src/smallmap_gui.cpp
#	src/strgen/strgen.cpp
1 week ago
..
CMakeLists.txt
grf.cpp Merge branch 'master' into jgrpp 3 weeks ago
grf.hpp Merge branch 'master' into jgrpp 1 month ago
sprite_file.cpp Codechange: range based for loops instead of C-style for loops 2 months ago
sprite_file_type.hpp Merge branch 'master' into jgrpp 1 month ago
spriteloader.hpp Codechange: rename byte to uint8_t (#12308) 3 months ago