miguel.horta/openttd-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
3b9008723080510bec1de96562a5f3ffb54d659d
openttd-android/projects
History
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
..
determineversion.vbs
(svn r24826) -Fix: determineversion.vbs could hang in a git checkout
2012-12-19 02:42:25 +00:00
generate
(svn r27382) -Add: [Win32] Project files for Visual Studio 2015.
2015-08-10 20:36:57 +00:00
generate_vs80.vcproj
(svn r20154) -Fix: A missing entry caused MSVC to modify generate_vs*.vcproj all the time.
2010-07-15 17:14:36 +00:00
generate_vs90.vcproj
(svn r20154) -Fix: A missing entry caused MSVC to modify generate_vs*.vcproj all the time.
2010-07-15 17:14:36 +00:00
generate_vs100.vcxproj
(svn r20032) -Add: MSVC 2010 project files
2010-06-28 19:07:33 +00:00
generate_vs140.vcxproj
(svn r27382) -Add: [Win32] Project files for Visual Studio 2015.
2015-08-10 20:36:57 +00:00
generate.vbs
(svn r27382) -Add: [Win32] Project files for Visual Studio 2015.
2015-08-10 20:36:57 +00:00
langs_vs80.vcproj
(svn r26993) -Feature: Latin translation (Supercheese)
2014-10-11 21:30:33 +00:00
langs_vs80.vcproj.in
(svn r23409) -Change: reorder files in langs project
2011-12-03 22:34:15 +00:00
langs_vs90.vcproj
(svn r26993) -Feature: Latin translation (Supercheese)
2014-10-11 21:30:33 +00:00
langs_vs90.vcproj.in
(svn r23409) -Change: reorder files in langs project
2011-12-03 22:34:15 +00:00
langs_vs100.vcxproj
(svn r26993) -Feature: Latin translation (Supercheese)
2014-10-11 21:30:33 +00:00
langs_vs100.vcxproj.filters
(svn r26995) -Fix: Add missing files to source.list
2014-10-11 21:38:32 +00:00
langs_vs100.vcxproj.filters.in
(svn r23409) -Change: reorder files in langs project
2011-12-03 22:34:15 +00:00
langs_vs100.vcxproj.in
(svn r23409) -Change: reorder files in langs project
2011-12-03 22:34:15 +00:00
langs_vs140.vcxproj
(svn r27382) -Add: [Win32] Project files for Visual Studio 2015.
2015-08-10 20:36:57 +00:00
langs_vs140.vcxproj.filters
(svn r27382) -Add: [Win32] Project files for Visual Studio 2015.
2015-08-10 20:36:57 +00: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 r27382) -Add: [Win32] Project files for Visual Studio 2015.
2015-08-10 20:36:57 +00:00
openttd_vs80.sln
(svn r22192) -Fix (r22188): MSVC 2005 64 bits didn't build settings(gen), and as such compilation failed
2011-03-05 08:48:37 +00:00
openttd_vs80.vcproj
Merge commit 'a8b575671894ffe1329ef37dca4989c0e60d70f5'
2016-03-27 22:33:11 +03:00
openttd_vs80.vcproj.in
(svn r26194) -Change: add SSE detection to the configure script with the possibility to disable it (based on patch by MJP)
2014-01-02 08:35:45 +00:00
openttd_vs80.vcproj.user
(svn r7759) -Merge: makefile rewrite. This merge features:
2007-01-02 19:19:48 +00:00
openttd_vs90.sln
(svn r26339) -Revert (r26305): Accidental changes to the VS9.0 solution file disabling the x64 build.
2014-02-15 15:01:32 +00:00
openttd_vs90.vcproj
Merge commit 'a8b575671894ffe1329ef37dca4989c0e60d70f5'
2016-03-27 22:33:11 +03:00
openttd_vs90.vcproj.in
(svn r26194) -Change: add SSE detection to the configure script with the possibility to disable it (based on patch by MJP)
2014-01-02 08:35:45 +00:00
openttd_vs90.vcproj.user
(svn r12996) -Fix: debugging was not possible with MSVC 2008
2008-05-07 20:10:48 +00:00
openttd_vs100.sln
(svn r22188) -Add: Generate the settings as part of the MSVC build process, and enable it in Makefile too
2011-03-04 22:34:10 +00:00
openttd_vs100.vcxproj
Merge commit 'a8b575671894ffe1329ef37dca4989c0e60d70f5'
2016-03-27 22:33:11 +03:00
openttd_vs100.vcxproj.filters
Merge commit 'a8b575671894ffe1329ef37dca4989c0e60d70f5'
2016-03-27 22:33:11 +03:00
openttd_vs100.vcxproj.filters.in
(svn r20598) -Codechange: [Win32] Replace the external x64 asm with a built-in Windows function.
2010-08-23 18:19:15 +00:00
openttd_vs100.vcxproj.in
(svn r26194) -Change: add SSE detection to the configure script with the possibility to disable it (based on patch by MJP)
2014-01-02 08:35:45 +00: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
(svn r27382) -Add: [Win32] Project files for Visual Studio 2015.
2015-08-10 20:36:57 +00:00
openttd_vs140.vcxproj.filters
(svn r27382) -Add: [Win32] Project files for Visual Studio 2015.
2015-08-10 20:36:57 +00:00
openttd_vs140.vcxproj.filters.in
(svn r27382) -Add: [Win32] Project files for Visual Studio 2015.
2015-08-10 20:36:57 +00:00
openttd_vs140.vcxproj.in
(svn r27382) -Add: [Win32] Project files for Visual Studio 2015.
2015-08-10 20:36:57 +00:00
settings_vs80.vcproj
(svn r25291) -Add: WindowDesc ability to load and store information in a config file.
2013-05-26 19:27:22 +00:00
settings_vs80.vcproj.in
(svn r22190) -Fix (r22188): minor changes in project files
2011-03-04 23:44:10 +00:00
settings_vs90.vcproj
(svn r25291) -Add: WindowDesc ability to load and store information in a config file.
2013-05-26 19:27:22 +00:00
settings_vs90.vcproj.in
(svn r22190) -Fix (r22188): minor changes in project files
2011-03-04 23:44:10 +00:00
settings_vs100.vcxproj
(svn r25291) -Add: WindowDesc ability to load and store information in a config file.
2013-05-26 19:27:22 +00:00
settings_vs100.vcxproj.filters
(svn r25291) -Add: WindowDesc ability to load and store information in a config file.
2013-05-26 19:27:22 +00:00
settings_vs100.vcxproj.filters.in
(svn r22189) -Fix (r22188): Add svn properties to the new files
2011-03-04 22:47:43 +00:00
settings_vs100.vcxproj.in
(svn r22191) -Fix: make sure table/settings.h is generated with MSVC2010, also fix a warning in version project
2011-03-05 01:31:56 +00:00
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
settingsgen_vs80.vcproj
(svn r22189) -Fix (r22188): Add svn properties to the new files
2011-03-04 22:47:43 +00:00
settingsgen_vs90.vcproj
(svn r22189) -Fix (r22188): Add svn properties to the new files
2011-03-04 22:47:43 +00:00
settingsgen_vs100.vcxproj
(svn r22190) -Fix (r22188): minor changes in project files
2011-03-04 23:44:10 +00:00
settingsgen_vs100.vcxproj.filters
(svn r22189) -Fix (r22188): Add svn properties to the new files
2011-03-04 22:47:43 +00:00
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
strgen_vs80.vcproj
(svn r23577) -Fix (r23576): strgen project files aren't automatically updated :(
2011-12-17 18:39:29 +00:00
strgen_vs90.vcproj
(svn r23577) -Fix (r23576): strgen project files aren't automatically updated :(
2011-12-17 18:39:29 +00:00
strgen_vs100.vcxproj
(svn r23577) -Fix (r23576): strgen project files aren't automatically updated :(
2011-12-17 18:39:29 +00:00
strgen_vs100.vcxproj.filters
(svn r23577) -Fix (r23576): strgen project files aren't automatically updated :(
2011-12-17 18:39:29 +00:00
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
version_vs80.vcproj
(svn r17407) -Fix (r17336): version_vs?0.vcproj not updated to new path
2009-09-03 20:03:01 +00:00
version_vs90.vcproj
(svn r17407) -Fix (r17336): version_vs?0.vcproj not updated to new path
2009-09-03 20:03:01 +00:00
version_vs100.vcxproj
(svn r22191) -Fix: make sure table/settings.h is generated with MSVC2010, also fix a warning in version project
2011-03-05 01:31:56 +00:00
version_vs140.vcxproj
(svn r27382) -Add: [Win32] Project files for Visual Studio 2015.
2015-08-10 20:36:57 +00:00