Sergeanur f1bb09826d Merge remote-tracking branch 'origin/master' into miami ... # Conflicts: # gamefiles/TEXT/american.gxt # premake5.lua # src/audio/MusicManager.cpp # src/control/Darkel.cpp # src/control/Script.cpp # src/core/FileLoader.cpp # src/core/Frontend.cpp # src/core/Game.cpp # src/core/Streaming.cpp # src/core/config.h # src/core/re3.cpp # src/extras/frontendoption.cpp # src/extras/frontendoption.h # src/render/Hud.cpp # src/skel/glfw/glfw.cpp # src/vehicles/CarGen.cpp # src/vehicles/Vehicle.cpp # src/weapons/WeaponInfo.cpp # utils/gxt/american.txt		2020-10-11 01:18:08 +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 remote-tracking branch 'origin/master' into miami	2020-10-11 01:18:08 +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