Sergeanur 30384bb4ef Merge branch 'master' into miami ... # Conflicts: # src/render/Credits.cpp		2020-07-17 21:15:47 +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-07-17 21:15:47 +03:00
win.h	Linux build support	2020-05-11 21:00:55 +03:00
win.rc	remove some unneeded plane paths for the moment; also different exe icon	2020-05-16 11:34:51 +02:00