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
..
compat_asdg	Add ACE_acc_pointer_green_IR to ASDG compat	2015-05-15 22:28:46 -05:00
compat_bwa3	Merge branch 'master' into ace_spectator	2015-07-26 14:15:24 +01:00
compat_cup	CUP weapon config improvement:	2015-06-14 17:46:46 +02:00
compat_r3f	Added R3F compat pbo	2015-06-07 10:11:50 +02:00
compat_rh_acc	Fixes broken scope config (#1312)	2015-05-23 17:06:46 +02:00
compat_rh_de	Added more missing PBOPREFIX files	2015-05-11 17:43:48 +02:00
compat_rh_m4	Added more missing PBOPREFIX files	2015-05-11 17:43:48 +02:00
compat_rh_pdw	Added more missing PBOPREFIX files	2015-05-11 17:43:48 +02:00
compat_rhs_afrf3	rhs headgear compat	2015-07-01 22:25:19 +02:00
compat_rhs_usf3	Merge branch 'master' into ace_spectator	2015-07-26 14:15:24 +01:00
compat_rksl_pm_ii	Fixes broken scope config (#1312)	2015-05-23 17:06:46 +02:00
compat_sma3_iansky	Elevation and windage can now have different adjustment increments:	2015-05-19 20:13:31 +02:00
server	Fixed Capitalized folders on include paths	2015-05-20 23:28:10 +02:00
tracers	Merge branch 'master' into ace_spectator	2015-07-26 14:15:24 +01:00
userconfig/ace	Update serverconfig.hpp	2015-04-04 22:58:14 +02:00