KoffeinFlummi f16f282abd Merge remote-tracking branch 'origin/release' into master-fix
Conflicts:
	addons/medical/functions/fnc_handleDamage.sqf
	extensions/common/p3d/animation.cpp
	extensions/common/p3d/compressed.cpp
	extensions/common/p3d/compressed.hpp
	extensions/common/pbo/archive.cpp
	extensions/common/pbo/search.cpp
	extensions/common/pbo/search.hpp
	extensions/common/shared.hpp
	extensions/common/simplepipe_win32.cpp
	extensions/common/simplepipe_win32.hpp
	extensions/common/simulation/object.cpp
	extensions/common/simulation/object.hpp
	extensions/common/targetver.h
	extensions/common/vector.hpp
2015-05-20 19:31:55 +02:00
..
2015-05-01 19:37:17 +02:00
2015-04-15 22:16:54 +02:00
2015-02-26 07:41:56 +01:00
2015-05-12 18:25:40 +02:00
2015-05-20 17:15:20 +02:00
2015-05-12 18:25:40 +02:00
2015-03-01 10:36:52 +01:00
2015-04-19 17:28:47 +02:00

ace_medical

Provides a basic and advanced medical system.

Maintainers

The people responsible for merging changes to this component or answering potential questions.