Commit Graph

4 Commits

Author SHA1 Message Date
esteldunedain
d6e70cfe6b Merge branch 'patch-3' of https://github.com/Legolasindar/ACE3 into Legolasindar-patch-3
Conflicts:
	addons/common/stringtable.xml
	addons/explosives/stringtable.xml
	addons/frag/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/interaction/stringtable.xml
	addons/inventory/stringtable.xml
	addons/laser_selfdesignate/stringtable.xml
	addons/logistics_wirecutter/stringtable.xml
	addons/medical/stringtable.xml
2015-04-10 16:20:18 -03:00
Legolasindar
2456660867 Update stringtable.xml 2015-04-10 01:36:42 +02:00
bux578
92da20ce62 translations
#367
2015-04-07 10:02:33 +02:00
esteldunedain
c82cef1b28 - self designate capabilities read from config
- add designator on/off actions to the interact_menu
2015-04-03 12:43:41 -03:00