ulteq 2332f19274 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into AdvancedBallistics ...

Conflicts:
	addons/ballistics/stringtable.xml
	addons/magazines/CfgAmmo.hpp
	addons/magazines/CfgMagazines.hpp
	addons/magazines/CfgVehicles.hpp
	addons/magazines/CfgWeapons.hpp
	addons/magazines/newclasses.txt

2015-04-13 21:35:53 +02:00

..

assets

add disarm icon, add action psd, move icon files

2015-04-12 14:47:08 +02:00

blank

Add ADDON variable to blank module

2015-01-19 12:40:03 +01:00

K4500_Instruction_Manual_English.pdf

Added manuals for the Horus ATrag and Kestrel 4500.

2015-04-06 11:39:21 +02:00

manual_Horus_ATrag-v385.pdf

Added manuals for the Horus ATrag and Kestrel 4500.

2015-04-06 11:39:21 +02:00

notepad++_SyntaxHighlighting_With_SQFandCBA.xml

Move syntax highlighting to extras/

2015-04-07 21:39:49 +02:00

Vector_USMC.pdf

changing macros, irl vector guide

2015-01-15 22:32:45 +01:00