mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00

History

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

functions

Cannot drop attachements because of duplication

2015-03-21 10:35:21 -05:00

$PBOPREFIX$

first pass

2015-01-13 13:12:37 -06:00

CfgEventHandlers.hpp

Base Cleanup

2015-02-19 19:32:41 -06:00

CfgMagazines.hpp

Base Cleanup