ACE3/addons/optionsmenu
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-04 15:31:10 -05:00
2015-01-21 05:43:58 -06:00
2015-05-14 20:59:25 +02:00

ace_optionsmenu

Adds the options menu used by other components.

Maintainers

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