Fix Merge

This commit is contained in:
PabstMirror 2016-06-14 19:37:22 -05:00
parent d46c596cc4
commit cfc046ce71

View File

@ -2,6 +2,7 @@
// interaction menu // interaction menu
PREP(addPassengerActions); PREP(addPassengerActions);
PREP(addPassengersActions); PREP(addPassengersActions);
PREP(getVehiclePos);
PREP(getWeaponPos); PREP(getWeaponPos);
PREP(moduleInteraction); PREP(moduleInteraction);