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

..

functions

Merge remote-tracking branch 'origin' into module-translations-2

2015-05-23 17:55:06 +02:00

$PBOPREFIX$

Adjusted PBOPREFIX

2015-05-10 13:28:18 +02:00

ACE_Settings.hpp

Merge remote-tracking branch 'origin' into module-translations-2

2015-05-23 17:55:06 +02:00

CfgEventHandlers.hpp

First working version

2015-05-08 14:14:15 +02:00

CfgVehicles.hpp

Merge branch 'master' into macroSTR

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

config.cpp

All working except module returning any.

2015-05-08 18:30:28 +02:00

script_component.hpp

Added required files for new module

2015-05-07 22:41:44 +02:00

stringtable.xml

Merge remote-tracking branch 'origin' into module-translations-2

2015-05-23 17:55:06 +02:00

XEH_postInit.sqf

Make viewdistance disabable through settings and module

2015-05-14 16:36:12 -03:00

XEH_preInit.sqf

Integrated new function into module

2015-05-14 17:44:35 +02:00