Merge remote-tracking branch 'upstream/master'

2019-07-01 00:18:10 +03:00
parent 02c7cbc75f c661485ef7
commit be808bed53
36 changed files with 905 additions and 120 deletions
--- a/src/control/Replay.h
+++ b/src/control/Replay.h
@@ -3,7 +3,6 @@
 #include "Camera.h"
 #include "Ped.h"
 #include "Pools.h"
-#include "Pickup.h"
 #include "Radar.h"
 #include "References.h"
 #include "Vehicle.h"