pelya 3ef1c1baff Merge commit 'a8b575671894ffe1329ef37dca4989c0e60d70f5' ...

These merges are becoming more awful every time

Conflicts:
	src/ai/ai_gui.cpp
	src/build_vehicle_gui.cpp
	src/cheat_gui.cpp
	src/company_gui.cpp
	src/depot_gui.cpp
	src/dock_gui.cpp
	src/error_gui.cpp
	src/genworld_gui.cpp
	src/misc_gui.cpp
	src/network/network_content_gui.cpp
	src/network/network_gui.cpp
	src/newgrf_gui.cpp
	src/news_gui.cpp
	src/rail_gui.cpp
	src/rev.cpp.in
	src/road_gui.cpp
	src/settings_gui.cpp
	src/settings_gui.h
	src/signs_gui.cpp
	src/station_gui.cpp
	src/table/settings.ini
	src/terraform_gui.cpp
	src/toolbar_gui.cpp
	src/toolbar_gui.h
	src/vehicle_gui.cpp
	src/video/sdl_v.cpp
	src/viewport.cpp
	src/widget.cpp
	src/widgets/settings_widget.h

2016-03-27 22:33:11 +03:00

..

alloc_func.cpp

(svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values

2014-04-23 20:13:33 +00:00

alloc_func.hpp

(svn r23640) -Fix: stop using FORCEINLINE (1/3rd of the instances were, the others were still regular inline), but make sure inline is always a 'forced' inline (I am looking at you MSVC)

2011-12-20 17:57:56 +00:00

alloc_type.hpp

(svn r23880) -Add: A simple smart pointer.

2012-02-04 13:28:35 +00:00

backup_type.hpp

(svn r19931) -Fix (r19914): Convert assertion in Backup<> destructor into DEBUG() output. It was triggered on exceptions, especially when aborting world generation.

2010-06-05 12:16:12 +00:00

bitmath_func.cpp

(svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values

2014-04-23 20:13:33 +00:00

bitmath_func.hpp

(svn r25685) -Codechange: [OSX] Use non-deprecated functions for byte swapping.

2013-08-05 20:37:29 +00:00

endian_func.hpp

(svn r23640) -Fix: stop using FORCEINLINE (1/3rd of the instances were, the others were still regular inline), but make sure inline is always a 'forced' inline (I am looking at you MSVC)

2011-12-20 17:57:56 +00:00

endian_type.hpp

(svn r22411) -Document: another bunch of bits

2011-05-02 17:42:12 +00:00

enum_type.hpp

Add functions for cycling inside an enum.

2014-03-15 21:56:55 +02:00

geometry_func.cpp

(svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values

2014-04-23 20:13:33 +00:00

geometry_func.hpp

(svn r17248) -Fix: add GPL license notice where appropriate

2009-08-21 20:21:05 +00:00

geometry_type.hpp

(svn r17248) -Fix: add GPL license notice where appropriate

2009-08-21 20:21:05 +00:00

math_func.cpp

(svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values

2014-04-23 20:13:33 +00:00

math_func.hpp

(svn r26651) -Fix: make sure an abs is used that supports int64 when using abs on those variables

2014-06-17 19:01:45 +00:00

mem_func.hpp

(svn r23640) -Fix: stop using FORCEINLINE (1/3rd of the instances were, the others were still regular inline), but make sure inline is always a 'forced' inline (I am looking at you MSVC)

2011-12-20 17:57:56 +00:00

multimap.hpp

(svn r25348) -Add: multimap implementation with guaranteed order between equal keys

2013-06-09 12:52:11 +00:00

overflowsafe_type.hpp

(svn r26685) -Fix: Tighten parameter bound checks on GSCargoMonitor functions, and return -1 on out-of-bound parameters.

2014-07-12 17:04:14 +00:00

pool_func.cpp

(svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values

2014-04-23 20:13:33 +00:00

pool_func.hpp

(svn r27381) -Fix: Warnings due to C++11 requirements for explicit narrowing conversions in initializer lists.

2015-08-10 20:24:13 +00:00

pool_type.hpp

(svn r26333) -Fix: Compilation without static_assert.

2014-02-11 20:34:48 +00:00

random_func.cpp

(svn r27049) -Fix (r26482): Fix compilation with --enable-desync-debug.

2014-10-28 11:32:19 +00:00

random_func.hpp

(svn r25893) -Fix: Document RandomRange and change misleading parameter name 'max' in random functions.

2013-10-20 14:48:08 +00:00

smallmap_type.hpp

(svn r24741) -Add: Const-methods to SmallMap.

2012-11-14 22:50:30 +00:00

smallmatrix_type.hpp

(svn r25256) -Add: small matrix type (like vector, but for matrices) (fonsinchen)

2013-05-19 14:06:26 +00:00

smallstack_type.hpp

(svn r26343) -Fix: Rewrite SmallStack so that it doesn't use a pool and is reentrant.

2014-02-16 16:25:18 +00:00

smallvec_type.hpp

(svn r25043) -Change [FS#3764]: Only display subtypes in the refit GUI which are available for all selected vehicles. Also add a generic list item to refit while keeping the subtypes of individual vehicles.

2013-02-24 16:43:24 +00:00

sort_func.hpp

(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)

2013-01-08 22:46:42 +00:00

string_compare_type.hpp

(svn r22411) -Document: another bunch of bits

2011-05-02 17:42:12 +00:00