PabstMirror 5c4dbdcbda Merge branch 'master' into medical-rewrite ... Conflicts: addons/medical/ACE_Settings.hpp addons/medical/XEH_postInit.sqf addons/medical/functions/fnc_adjustPainLevel.sqf addons/medical/functions/fnc_copyDeadBody.sqf addons/medical/functions/fnc_getTriageStatus.sqf addons/medical/functions/fnc_handleBandageOpening.sqf addons/medical/functions/fnc_handleCollisionDamage.sqf addons/medical/functions/fnc_handleDamage_fractures.sqf addons/medical/functions/fnc_handleDamage_woundsOld.sqf addons/medical/functions/fnc_init.sqf addons/medical/functions/fnc_moduleAssignMedicalFacility.sqf addons/medical/functions/fnc_parseConfigForInjuries.sqf addons/medical/functions/fnc_setDead.sqf addons/medical/functions/fnc_setHitPointDamage.sqf addons/medical/functions/fnc_setUnconscious.sqf addons/medical/functions/fnc_showBloodEffect.sqf addons/medical/functions/fnc_unconsciousPFH.sqf addons/medical/stringtable.xml addons/medical_ai/functions/fnc_healUnit.sqf addons/medical_ai/functions/fnc_isInjured.sqf addons/medical_menu/functions/fnc_handleUI_DisplayOptions.sqf		2017-10-24 16:13:12 -05:00
..
advanced_ballistics	Advanced Ballistics - Drag model revamp & Spin drift correction (#5566)	2017-10-06 13:05:20 -05:00
break_line	Fixed c4996 compiler warning/error due to use of strncpy	2016-02-17 15:31:12 -06:00
build	Normalize to LF line endings	2016-05-30 18:37:03 +02:00
clipboard	Merge branch 'master' into fix-c4996	2016-06-12 17:35:19 +02:00
cmake	Normalize to LF line endings	2016-05-30 18:37:03 +02:00
common	Normalize to LF line endings	2016-05-30 18:37:03 +02:00
dynload	Normalize to LF line endings	2016-05-30 18:37:03 +02:00
fcs	FCS - removed dead code (#4663)	2016-11-12 17:36:21 +01:00
medical	Use hitpoints in medical extension (#4494)	2016-10-02 09:41:17 +02:00
parse_imagepath	Fixed strncpy in parse_imagepath	2016-03-06 22:06:11 +03:00
CMakeLists.txt	Update AB dll for 3.11 changes (#5538)	2017-09-22 10:53:42 -05:00