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/projects
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
..
basesets_vs140.vcxproj
basesets_vs140.vcxproj.filters
basesets_vs140.vcxproj.filters.in
basesets_vs140.vcxproj.in
basesets_vs141.vcxproj
basesets_vs141.vcxproj.filters
basesets_vs141.vcxproj.filters.in
basesets_vs141.vcxproj.in
basesets_vs142.vcxproj
basesets_vs142.vcxproj.filters
basesets_vs142.vcxproj.filters.in
basesets_vs142.vcxproj.in
determineversion.vbs Merge branch 'master' into jgrpp 5 years ago
dpi_aware.manifest
gen-kdev4.sh Cleanup: Removed SVN headers 5 years ago
generate Merge branch 'master' into jgrpp 5 years ago
generate.vbs Cleanup: Removed SVN headers 5 years ago
generate_vs140.vcxproj
generate_vs141.vcxproj
generate_vs142.vcxproj
langs_vs140.vcxproj
langs_vs140.vcxproj.filters
langs_vs140.vcxproj.filters.in
langs_vs140.vcxproj.in
langs_vs141.vcxproj
langs_vs141.vcxproj.filters
langs_vs141.vcxproj.filters.in
langs_vs141.vcxproj.in
langs_vs142.vcxproj
langs_vs142.vcxproj.filters
langs_vs142.vcxproj.filters.in
langs_vs142.vcxproj.in
openttd_vs140.sln
openttd_vs140.vcxproj Merge branch 'jgrpp' into jgrpp-nrt 5 years ago
openttd_vs140.vcxproj.filters Merge branch 'jgrpp' into jgrpp-nrt 5 years ago
openttd_vs140.vcxproj.filters.in
openttd_vs140.vcxproj.in
openttd_vs141.sln
openttd_vs141.vcxproj Merge branch 'jgrpp' into jgrpp-nrt 5 years ago
openttd_vs141.vcxproj.filters Merge branch 'jgrpp' into jgrpp-nrt 5 years ago
openttd_vs141.vcxproj.filters.in
openttd_vs141.vcxproj.in
openttd_vs142.sln
openttd_vs142.vcxproj Merge branch 'jgrpp' into jgrpp-nrt 5 years ago
openttd_vs142.vcxproj.filters Merge branch 'jgrpp' into jgrpp-nrt 5 years ago
openttd_vs142.vcxproj.filters.in
openttd_vs142.vcxproj.in
os_versions.manifest
regression.bat
regression_vs140.vcxproj
regression_vs141.vcxproj
regression_vs142.vcxproj
settings_vs140.vcxproj
settings_vs140.vcxproj.filters
settings_vs140.vcxproj.filters.in
settings_vs140.vcxproj.in
settings_vs141.vcxproj
settings_vs141.vcxproj.filters
settings_vs141.vcxproj.filters.in
settings_vs141.vcxproj.in
settings_vs142.vcxproj
settings_vs142.vcxproj.filters
settings_vs142.vcxproj.filters.in
settings_vs142.vcxproj.in
settingsgen_vs140.vcxproj
settingsgen_vs140.vcxproj.filters
settingsgen_vs141.vcxproj
settingsgen_vs141.vcxproj.filters
settingsgen_vs142.vcxproj
settingsgen_vs142.vcxproj.filters
strgen_vs140.vcxproj
strgen_vs140.vcxproj.filters
strgen_vs141.vcxproj
strgen_vs141.vcxproj.filters
strgen_vs142.vcxproj
strgen_vs142.vcxproj.filters
version_vs140.vcxproj
version_vs141.vcxproj
version_vs142.vcxproj