Sergeanur cea6b20c09 Merge remote-tracking branch 'origin/miami' into lcs ... # Conflicts: # src/animation/CutsceneMgr.cpp # src/control/CarCtrl.cpp # src/control/Script.cpp # src/control/Script2.cpp # src/core/Frontend.cpp # src/core/main.cpp # src/entities/Physical.cpp # src/peds/Ped.cpp # src/peds/PedAI.cpp # src/text/Messages.cpp # src/vehicles/Cranes.cpp # src/vehicles/Transmission.cpp		2021-01-22 15:04:09 +02:00
..
Dummy.cpp	get rid of most --MIAMI comments	2021-01-22 11:43:29 +01:00
Dummy.h	script revision	2020-05-19 01:49:09 +03:00
Entity.cpp	Merge remote-tracking branch 'origin/miami' into lcs	2021-01-22 15:04:09 +02:00
Entity.h	initial work on vehicles	2021-01-18 10:59:19 +01:00
Physical.cpp	get rid of most --MIAMI comments	2021-01-22 11:43:29 +01:00
Physical.h	initial work on vehicles	2021-01-18 10:59:19 +01:00