Commit Graph

4 Commits (c41bf4b468d3967211e43ca5dbc3a090ae7447e3)

Author SHA1 Message Date
Jonathan G Rennison c20cf31514 Merge branch 'cpp-11' into enhanced_viewport_overlay
# Conflicts:
#	src/rail_gui.cpp
#	src/saveload/saveload.cpp
#	src/smallmap_gui.cpp
8 years ago
Jonathan G Rennison 6e9ea59ab5 Add a simple scope guard include file. 8 years ago
Jonathan G Rennison ddcb3bf560 Update project files. 9 years ago
michi_cc f4cd0198f4 (svn r27382) -Add: [Win32] Project files for Visual Studio 2015. 9 years ago