Sergeanur 9647901ba0 Merge branch 'miami' into lcs ... # Conflicts: # src/control/Script.h # src/modelinfo/SimpleModelInfo.cpp # src/modelinfo/VehicleModelInfo.cpp # src/rw/VisibilityPlugins.cpp # src/rw/VisibilityPlugins.h		2021-01-25 19:35:03 +02:00
..
glfw	Merge branch 'miami' into lcs	2021-01-25 19:35:03 +02:00
win	Merge branch 'miami' into lcs	2021-01-25 19:35:03 +02:00
crossplatform.cpp	Frontend: Stats, Map, Audio inputs, Radio selector	2020-11-18 00:33:45 +03:00
crossplatform.h	make building with Codewarrior 7 possible	2021-01-24 17:08:34 +01:00
events.cpp	get rid of most --MIAMI comments	2021-01-22 11:43:29 +01:00
events.h	rw skeleton	2019-05-31 20:02:26 +03:00
platform.h	Merge branch 'master' into miami	2020-08-15 15:13:46 +03:00
skeleton.cpp	Merge remote-tracking branch 'origin/miami' into lcs	2021-01-22 15:04:09 +02:00
skeleton.h	AnimViewer fixes, commentary from miami	2020-12-09 05:10:57 +03:00