Jonathan G Rennison 90cd312428 Merge branch 'master' into jgrpp ...

# Conflicts:
#	src/fios.h

2017-01-17 19:11:09 +00:00

..

aystar.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

aystar.h

(svn r27733) -Codechange: Pass NPF user data as void* instead of as array of integers.

2017-01-15 13:59:46 +00:00

npf_func.h

(svn r24481) -Feature [FS#5127]: Make the pathfinder decide whether ships shall leave depots towards north or south.

2012-08-18 11:37:47 +00:00

npf.cpp

Merge branch 'master' into jgrpp

2017-01-17 19:11:09 +00:00

queue.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

queue.h

(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