1
0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
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-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.