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-11 10:56:58 -07:00
2015-05-25 05:34:07 -05:00
2015-04-11 10:44:13 -07:00
2015-05-25 05:34:07 -05:00
2015-05-28 21:59:04 +02:00
2015-04-11 13:39:16 -07:00
2015-04-17 07:28:19 -07:00

ace_javelin

Adds the Javelin AT launcher.

Maintainers

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