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-06-13 17:16:18 +02:00
2015-01-13 22:41:53 -03:00
2015-03-16 10:56:05 -05:00
2015-04-20 02:17:47 -05:00
2015-07-01 21:21:09 +02:00
2015-04-20 02:17:47 -05:00

ace_hearing

Introduces combat deafness.

Maintainers

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