Merge branch 'departure-boards-sx' into jgrpp

Conflicts: src/saveload/extended_ver_sl.cpp src/saveload/extended_ver_sl.h src/window_type.h
2015-08-02 18:23:25 +01:00
parent 6596ba216c 6c81f8f35b
commit 6452b0fe02
34 changed files with 2471 additions and 43 deletions
--- a/src/window_type.h
+++ b/src/window_type.h
@@ -693,6 +693,11 @@ enum WindowClass {
 	 */
 	WC_SIGNAL_PROGRAM,

+	/**
+	 * Departure boards
+	 */
+	WC_DEPARTURES_BOARD,
+
 	WC_INVALID = 0xFFFF, ///< Invalid window.
 };