Jonathan G Rennison 191afd93c1 Merge branch 'save_ext' into jgrpp ...

# Conflicts:
#	src/lang/english.txt
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/settings.cpp
#	src/station_cmd.cpp
#	src/table/settings.ini
#	src/vehicle_base.h
#	src/widgets/dropdown.cpp

2019-01-21 19:28:29 +00:00

..

crashlog_win.cpp

Merge branch 'crashlog_improvements' into jgrpp

2017-09-04 01:23:08 +01:00

ottdres.rc.in

Change: Non-tag revisions are now named '<commitdate>-<branch>-g<shorthash><modified>'.

2018-04-12 22:26:45 +02:00

string_uniscribe.cpp

Fix: [Win32] Align sprite glyphs to the font baseline when using Uniscribe text layout.

2018-12-01 11:57:14 +01:00

string_uniscribe.h

Revert "Revert "Add: [Win32] Uniscribe configure options for MinGW targets.""

2018-06-25 18:39:59 +01:00

win32.cpp

Merge branch 'save_ext' into jgrpp

2019-01-21 19:28:29 +00:00

win32.h

Revert "Revert "Add: [Win32] Uniscribe configure options for MinGW targets.""

2018-06-25 18:39:59 +01:00