mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00

History

jonpas 541f1010a7 Merge branch 'master' into macroSTR

Conflicts:
	addons/attach/functions/fnc_attach.sqf
	addons/captives/functions/fnc_moduleSurrender.sqf
	addons/common/CfgVehicles.hpp
	addons/explosives/CfgModule.hpp
	addons/hearing/CfgVehicles.hpp
	addons/interaction/CfgVehicles.hpp
	addons/map/CfgVehicles.hpp
	addons/microdagr/CfgVehicles.hpp
	addons/mk6mortar/CfgVehicles.hpp
	addons/nametags/CfgVehicles.hpp
	addons/nightvision/functions/fnc_changeNVGBrightness.sqf
	addons/respawn/CfgVehicles.hpp
	addons/switchunits/CfgVehicles.hpp
	addons/vehiclelock/CfgVehicles.hpp
	addons/winddeflection/stringtable.xml

2015-06-02 22:14:32 +02:00

data

Replaced TABs and newline braces

2015-04-13 23:10:55 +02:00

functions

Merge pull request #1424 from acemod/barometricPressureFix

2015-05-29 12:40:17 +02:00

New nighttime picture.

2015-05-26 22:26:30 +02:00

$PBOPREFIX$

Added missing PBOPREFIX files

2015-05-11 17:37:08 +02:00