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

data/icon

Dragon, lasers, air_hud and javelin code.

2015-01-11 10:24:19 -08:00

functions

Cleaning up of all tabs in source code files.

2015-04-06 09:22:43 -07:00

$PBOPREFIX$

Dragon, lasers, air_hud and javelin code.

2015-01-11 10:24:19 -08:00

CfgAmmo.hpp

Cleaning up of all tabs in source code files.