Merge branch 'master' into jgrpp

# Conflicts:
#	src/company_gui.cpp
#	src/group_gui.cpp
#	src/newgrf.cpp
#	src/newgrf_debug_gui.cpp
#	src/saveload/saveload.cpp

src/group_gui_list.h

@@ -0,0 +1,19 @@
+/*
+ * This file is part of OpenTTD.
+ * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
+ * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/** @file group_gui_list.h Group GUI lists. */
+
+#ifndef GROUP_GUI_LIST_H
+#define GROUP_GUI_LIST_H
+
+#include "group.h"
+#include "sortlist_type.h"
+
+typedef GUIList<const Group*> GUIGroupList;
+void SortGUIGroupList(GUIGroupList &list);
+
+#endif /* GROUP_GUI_LIST_H */