Jonathan G Rennison
0e7519f33e
Merge branch 'more_cond_orders-sx' into jgrpp
# Conflicts:
# config.lib
# projects/openttd_vs100.vcxproj
# projects/openttd_vs100.vcxproj.filters
# projects/openttd_vs80.vcproj
# projects/openttd_vs90.vcproj
# src/order_gui.cpp
# src/order_type.h
# src/saveload/afterload.cpp
# src/saveload/extended_ver_sl.cpp
2019-01-06 22:35:57 +00:00
..
2019-01-05 18:10:14 +01:00
2019-01-02 16:58:25 +00:00
2015-08-20 00:39:26 +01:00
2018-03-14 19:36:41 +00:00
2009-01-31 23:50:53 +00:00