Sergeanur 904090cbb6 Merge remote-tracking branch 'origin/miami' into lcs ... # Conflicts: # src/modelinfo/BaseModelInfo.cpp		2021-01-23 15:14:15 +02:00
..
gtalcs.ico	PC controls and icon	2021-01-08 16:57:22 +02:00
resource.h	Radar, WaterCannon, win/glfw skels	2020-10-17 17:35:26 +03:00
win.cpp	Merge remote-tracking branch 'origin/miami' into lcs	2021-01-23 15:14:15 +02:00
win.h	Fix/change some Windows define	2020-07-25 15:24:24 +03:00
win.rc	PC controls and icon	2021-01-08 16:57:22 +02:00