1
0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
esteldunedain 6f4bb48489 Merge branch 'master' into linearMenuExperiment
Conflicts:
	addons/attach/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/interaction/stringtable.xml
	addons/laser_selfdesignate/stringtable.xml
	addons/magazinerepack/stringtable.xml
	addons/overheating/stringtable.xml
	extensions/CMakeLists.txt
2015-04-14 19:09:57 -03:00
..
2015-01-16 15:37:32 +01:00
2015-01-16 15:37:32 +01:00
2015-02-11 15:43:08 -06:00
2015-04-01 13:09:22 -05:00
2015-04-01 11:21:30 -05:00
2015-02-08 13:48:53 -06:00
2015-04-01 15:09:05 -05:00

ace_magazinerepack

Adds the ability to consolidate multiple half-empty magazines.

Maintainers

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