SilentSpike 159937dc45 Merge branch 'master' into ace_spectator ... Conflicts: addons/explosives/stringtable.xml addons/interact_menu/stringtable.xml addons/interaction/stringtable.xml addons/map/stringtable.xml addons/medical/stringtable.xml addons/sitting/stringtable.xml addons/spectator/stringtable.xml extras/assets/icons/Icons_Modules.psd		2015-07-26 14:15:24 +01:00
..
assets	Merge branch 'master' into ace_spectator	2015-07-26 14:15:24 +01:00
blank	Add ADDON variable to blank module	2015-01-19 12:40:03 +01:00
airFrictionAnalysis.txt	Updated all airFriction values according to: extras/airFrictionAnalysis.txt	2015-05-31 16:45:59 +02:00
CfgAmmoReference.hpp	Convert ACE_barrelLength(s) to millimeters	2015-05-08 12:47:45 +02:00
CfgWeaponsReference.hpp	Convert ACE_barrelLength(s) to millimeters	2015-05-08 12:47:45 +02: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
YardageProSport.pdf	Added the yardage manual	2015-06-03 16:32:19 +02:00