Sergeanur 9956b27767 Merge branch 'master' into miami ...

# Conflicts:
#	src/control/Darkel.cpp
#	src/core/main.cpp

2020-08-15 15:13:46 +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-15 15:13:46 +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