Sergeanur 827b240078 Merge branch 'master' into miami ... # Conflicts: # gamefiles/TEXT/american.gxt # src/control/Garages.cpp # src/control/Record.cpp # src/control/Script.cpp # src/core/Collision.cpp # src/core/Frontend.cpp # src/core/Frontend.h # src/core/Game.cpp # src/core/MenuScreens.cpp # src/core/Streaming.cpp # src/core/config.h # src/core/re3.cpp # src/modelinfo/ModelInfo.cpp # src/render/Renderer.cpp # src/save/GenericGameStorage.cpp # utils/gxt/american.txt		2020-08-19 23:34:33 +03:00
..
gtavc.ico	remove some unneeded plane paths for the moment; also different exe icon	2020-05-16 11:34:51 +02:00
resource.h	WaterCannon done, resource ico	2020-03-28 17:02:44 +03:00
win.cpp	Merge branch 'master' into miami	2020-08-19 23:34:33 +03:00
win.h	Fix/change some Windows define	2020-07-25 15:24:24 +03:00
win.rc	remove some unneeded plane paths for the moment; also different exe icon	2020-05-16 11:34:51 +02:00