Jonathan G Rennison
ad1c402ad8
Merge branch 'master' into jgrpp
# Conflicts:
# src/debug.cpp
# src/saveload/afterload.cpp
# src/saveload/saveload.cpp
# src/settings_type.h
# src/town_cmd.cpp
# src/window.cpp
2018-05-03 23:54:51 +01:00
..
2014-04-23 20:13:33 +00:00
2011-12-20 17:57:56 +00:00
2012-02-04 13:28:35 +00:00
2018-04-30 13:38:58 +02:00
2016-09-04 18:01:38 +01:00
2016-09-12 18:37:28 +01:00
2017-03-29 19:39:55 +01:00
2017-03-29 19:46:30 +01:00
2011-12-20 17:57:56 +00:00
2018-04-30 23:57:28 +02:00
2013-01-08 22:46:42 +00:00
2014-04-23 20:13:33 +00:00
2018-02-10 11:24:11 +00:00
2015-11-22 23:16:09 +00:00
2017-10-05 18:20:54 +01:00
2011-12-20 17:57:56 +00:00
2016-09-12 23:30:43 +01:00
2014-07-12 17:04:14 +00:00
2014-04-23 20:13:33 +00:00
2017-03-29 19:47:25 +01:00
2017-09-04 01:22:54 +01:00
2016-10-10 19:02:05 +01:00
2013-10-20 14:48:08 +00:00
2012-11-14 22:50:30 +00:00
2013-05-19 14:06:26 +00:00
2018-04-27 02:42:20 +01:00
2018-04-15 20:49:29 +02:00
2013-01-08 22:46:42 +00:00