KoffeinFlummi 1b67b2df26 Merge branch 'master' of https://github.com/ramius86/ACE3 into italian-merge
Conflicts:
	addons/disposable/stringtable.xml
	addons/explosives/stringtable.xml
	addons/fcs/stringtable.xml
	addons/frag/stringtable.xml
	addons/hearing/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/interaction/stringtable.xml
	addons/inventory/stringtable.xml
	addons/javelin/stringtable.xml
	addons/kestrel4500/stringtable.xml
	addons/laser_selfdesignate/stringtable.xml
	addons/laserpointer/stringtable.xml
	addons/magazinerepack/stringtable.xml
	addons/maptools/stringtable.xml
	addons/markers/stringtable.xml
	addons/microdagr/stringtable.xml
	addons/movement/stringtable.xml
2015-04-15 22:20:47 +02:00
..
2015-04-15 10:11:13 -07:00
2015-04-11 10:56:58 -07:00
2015-04-11 10:44:13 -07:00
2015-04-12 22:45:55 -05:00
2015-04-11 13:39:16 -07:00

ace_javelin

Adds the Javelin AT launcher.

Maintainers

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