SilentSpike 159937dc45 Merge branch 'master' into ace_spectator
Conflicts:
	addons/explosives/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/interaction/stringtable.xml
	addons/map/stringtable.xml
	addons/medical/stringtable.xml
	addons/sitting/stringtable.xml
	addons/spectator/stringtable.xml
	extras/assets/icons/Icons_Modules.psd
2015-07-26 14:15:24 +01:00
..
2015-04-15 22:16:54 +02:00
2015-06-05 21:02:24 -05:00
2015-02-26 07:41:56 +01: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.