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
..
2018-10-31 12:35:54 +01:00
2018-12-09 01:13:27 +00:00
2018-06-27 23:14:30 +02:00
2013-01-08 22:46:42 +00:00
2015-08-08 13:19:38 +00:00
2018-12-21 03:27:58 +00:00
2018-06-27 23:14:30 +02:00
2018-12-09 01:13:27 +00:00
2015-08-08 13:19:38 +00:00
2015-08-08 13:19:38 +00:00
2015-08-08 13:19:38 +00:00
2018-12-09 01:13:27 +00:00
2019-01-06 22:35:57 +00:00
2018-07-02 21:04:06 +01:00
2018-12-09 01:13:27 +00:00
2012-08-18 11:37:47 +00:00
2013-07-14 09:20:34 +00:00