Jonathan G Rennison 56be293107 Merge branch 'master' into jgrpp ... # Conflicts: # src/blitter/32bpp_anim.cpp # src/blitter/32bpp_anim.hpp # src/blitter/32bpp_anim_sse2.cpp # src/blitter/32bpp_base.cpp # src/blitter/32bpp_base.hpp # src/ground_vehicle.cpp # src/linkgraph/linkgraph_gui.h # src/main_gui.cpp # src/newgrf_house.cpp # src/newgrf_house.h # src/town_cmd.cpp # src/vehicle_base.h # src/viewport_gui.cppp		2018-05-25 18:29:17 +01:00
..
determineversion.vbs	Merge branch 'cpp-11' into crashlog_improvements	2018-04-27 00:33:44 +01:00
dpi_aware.manifest	(svn r27791) -Fix (r27790) [FS#6366]: Try #2. Now also for Visual Studio 2010.	2017-03-13 21:56:38 +00:00
gen-kdev4.sh	(svn r27897) -Add [FS#6577]: Project file generator for kdevelop 4/5 (adf88)	2017-08-24 14:50:55 +00:00
generate	Fix: make generate[.vbs] produce the same result on Linux/Windows (#6764)	2018-04-29 21:30:45 +02:00
generate_vs80.vcproj
generate_vs90.vcproj
generate_vs100.vcxproj
generate_vs140.vcxproj	(svn r27382) -Add: [Win32] Project files for Visual Studio 2015.	2015-08-10 20:36:57 +00:00
generate_vs141.vcxproj	(svn r27918) -Fix (r27917): Next attempt for MSVC 2017	2017-09-24 16:19:29 +00:00
generate.vbs	(svn r27918) -Fix (r27917): Next attempt for MSVC 2017	2017-09-24 16:19:29 +00:00
langs_vs80.vcproj	Fix: make generate[.vbs] produce the same result on Linux/Windows (#6764)	2018-04-29 21:30:45 +02:00
langs_vs80.vcproj.in
langs_vs90.vcproj	Fix: make generate[.vbs] produce the same result on Linux/Windows (#6764)	2018-04-29 21:30:45 +02:00
langs_vs90.vcproj.in
langs_vs100.vcxproj	Fix: make generate[.vbs] produce the same result on Linux/Windows (#6764)	2018-04-29 21:30:45 +02:00
langs_vs100.vcxproj.filters	Fix: make generate[.vbs] produce the same result on Linux/Windows (#6764)	2018-04-29 21:30:45 +02:00
langs_vs100.vcxproj.filters.in
langs_vs100.vcxproj.in
langs_vs140.vcxproj	Fix: make generate[.vbs] produce the same result on Linux/Windows (#6764)	2018-04-29 21:30:45 +02:00
langs_vs140.vcxproj.filters	Fix: make generate[.vbs] produce the same result on Linux/Windows (#6764)	2018-04-29 21:30:45 +02:00
langs_vs140.vcxproj.filters.in	(svn r27382) -Add: [Win32] Project files for Visual Studio 2015.	2015-08-10 20:36:57 +00:00
langs_vs140.vcxproj.in	(svn r27920) -Fix: MSVC 2015 and 2017 project files referenced some MSVC 2010 files	2017-09-24 17:38:03 +00:00
langs_vs141.vcxproj	Fix: make generate[.vbs] produce the same result on Linux/Windows (#6764)	2018-04-29 21:30:45 +02:00
langs_vs141.vcxproj.filters	Fix: make generate[.vbs] produce the same result on Linux/Windows (#6764)	2018-04-29 21:30:45 +02:00
langs_vs141.vcxproj.filters.in	(svn r27918) -Fix (r27917): Next attempt for MSVC 2017	2017-09-24 16:19:29 +00:00
langs_vs141.vcxproj.in	(svn r27920) -Fix: MSVC 2015 and 2017 project files referenced some MSVC 2010 files	2017-09-24 17:38:03 +00:00
openttd_vs80.sln
openttd_vs80.vcproj	Merge branch 'master' into jgrpp	2018-05-25 18:29:17 +01:00
openttd_vs80.vcproj.in	Add: post build events to VS projects to copy the output into 'bin'	2018-04-22 19:24:07 +02:00
openttd_vs80.vcproj.user
openttd_vs90.sln
openttd_vs90.vcproj	Merge branch 'master' into jgrpp	2018-05-25 18:29:17 +01:00
openttd_vs90.vcproj.in	Add: post build events to VS projects to copy the output into 'bin'	2018-04-22 19:24:07 +02:00
openttd_vs90.vcproj.user
openttd_vs100.sln
openttd_vs100.vcxproj	Merge branch 'master' into jgrpp	2018-05-25 18:29:17 +01:00
openttd_vs100.vcxproj.filters	Merge branch 'master' into jgrpp	2018-05-25 18:29:17 +01:00
openttd_vs100.vcxproj.filters.in	Cleanup: Use new filename for README file. (#6738)	2018-04-21 11:05:38 +02:00
openttd_vs100.vcxproj.in	Feature: Add XAudio2 driver	2018-05-17 15:06:37 +01:00
openttd_vs140.sln	(svn r27382) -Add: [Win32] Project files for Visual Studio 2015.	2015-08-10 20:36:57 +00:00
openttd_vs140.vcxproj	Merge branch 'master' into jgrpp	2018-05-25 18:29:17 +01:00
openttd_vs140.vcxproj.filters	Merge branch 'master' into jgrpp	2018-05-25 18:29:17 +01:00
openttd_vs140.vcxproj.filters.in	Cleanup: Use new filename for README file. (#6738)	2018-04-21 11:05:38 +02:00
openttd_vs140.vcxproj.in	Feature: Add XAudio2 driver	2018-05-17 15:06:37 +01:00
openttd_vs141.sln	(svn r27918) -Fix (r27917): Next attempt for MSVC 2017	2017-09-24 16:19:29 +00:00
openttd_vs141.vcxproj	Merge branch 'master' into jgrpp	2018-05-25 18:29:17 +01:00
openttd_vs141.vcxproj.filters	Merge branch 'master' into jgrpp	2018-05-25 18:29:17 +01:00
openttd_vs141.vcxproj.filters.in	Cleanup: Use new filename for README file. (#6738)	2018-04-21 11:05:38 +02:00
openttd_vs141.vcxproj.in	Feature: Add XAudio2 driver	2018-05-17 15:06:37 +01:00
os_versions.manifest	Change: [Win32] Declare in the app manifest that all current Windows versions are natively supported.	2018-04-10 21:07:27 +02:00
settings_vs80.vcproj
settings_vs80.vcproj.in
settings_vs90.vcproj
settings_vs90.vcproj.in
settings_vs100.vcxproj
settings_vs100.vcxproj.filters
settings_vs100.vcxproj.filters.in
settings_vs100.vcxproj.in
settings_vs140.vcxproj	(svn r27382) -Add: [Win32] Project files for Visual Studio 2015.	2015-08-10 20:36:57 +00:00
settings_vs140.vcxproj.filters	(svn r27382) -Add: [Win32] Project files for Visual Studio 2015.	2015-08-10 20:36:57 +00:00
settings_vs140.vcxproj.filters.in	(svn r27382) -Add: [Win32] Project files for Visual Studio 2015.	2015-08-10 20:36:57 +00:00
settings_vs140.vcxproj.in	(svn r27382) -Add: [Win32] Project files for Visual Studio 2015.	2015-08-10 20:36:57 +00:00
settings_vs141.vcxproj	(svn r27918) -Fix (r27917): Next attempt for MSVC 2017	2017-09-24 16:19:29 +00:00
settings_vs141.vcxproj.filters	(svn r27918) -Fix (r27917): Next attempt for MSVC 2017	2017-09-24 16:19:29 +00:00
settings_vs141.vcxproj.filters.in	(svn r27918) -Fix (r27917): Next attempt for MSVC 2017	2017-09-24 16:19:29 +00:00
settings_vs141.vcxproj.in	(svn r27918) -Fix (r27917): Next attempt for MSVC 2017	2017-09-24 16:19:29 +00:00
settingsgen_vs80.vcproj
settingsgen_vs90.vcproj
settingsgen_vs100.vcxproj
settingsgen_vs100.vcxproj.filters
settingsgen_vs140.vcxproj	(svn r27382) -Add: [Win32] Project files for Visual Studio 2015.	2015-08-10 20:36:57 +00:00
settingsgen_vs140.vcxproj.filters	(svn r27382) -Add: [Win32] Project files for Visual Studio 2015.	2015-08-10 20:36:57 +00:00
settingsgen_vs141.vcxproj	(svn r27918) -Fix (r27917): Next attempt for MSVC 2017	2017-09-24 16:19:29 +00:00
settingsgen_vs141.vcxproj.filters	(svn r27918) -Fix (r27917): Next attempt for MSVC 2017	2017-09-24 16:19:29 +00:00
strgen_vs80.vcproj
strgen_vs90.vcproj
strgen_vs100.vcxproj
strgen_vs100.vcxproj.filters
strgen_vs140.vcxproj	(svn r27382) -Add: [Win32] Project files for Visual Studio 2015.	2015-08-10 20:36:57 +00:00
strgen_vs140.vcxproj.filters	(svn r27382) -Add: [Win32] Project files for Visual Studio 2015.	2015-08-10 20:36:57 +00:00
strgen_vs141.vcxproj	(svn r27918) -Fix (r27917): Next attempt for MSVC 2017	2017-09-24 16:19:29 +00:00
strgen_vs141.vcxproj.filters	(svn r27918) -Fix (r27917): Next attempt for MSVC 2017	2017-09-24 16:19:29 +00:00
version_vs80.vcproj
version_vs90.vcproj
version_vs100.vcxproj
version_vs140.vcxproj	(svn r27382) -Add: [Win32] Project files for Visual Studio 2015.	2015-08-10 20:36:57 +00:00
version_vs141.vcxproj	(svn r27918) -Fix (r27917): Next attempt for MSVC 2017	2017-09-24 16:19:29 +00:00