ACE3/optionals
KoffeinFlummi f16f282abd Merge remote-tracking branch 'origin/release' into master-fix
Conflicts:
	addons/medical/functions/fnc_handleDamage.sqf
	extensions/common/p3d/animation.cpp
	extensions/common/p3d/compressed.cpp
	extensions/common/p3d/compressed.hpp
	extensions/common/pbo/archive.cpp
	extensions/common/pbo/search.cpp
	extensions/common/pbo/search.hpp
	extensions/common/shared.hpp
	extensions/common/simplepipe_win32.cpp
	extensions/common/simplepipe_win32.hpp
	extensions/common/simulation/object.cpp
	extensions/common/simulation/object.hpp
	extensions/common/targetver.h
	extensions/common/vector.hpp
2015-05-20 19:31:55 +02:00
..
compat_asdg Added more missing PBOPREFIX files 2015-05-11 17:43:48 +02:00
compat_bwa3 Elevation and windage can now have different adjustment increments: 2015-05-19 20:13:31 +02:00
compat_cup Added more missing PBOPREFIX files 2015-05-11 17:43:48 +02:00
compat_hlc_ar15 Added more missing PBOPREFIX files 2015-05-11 17:43:48 +02:00
compat_hlc_wp_mp5 Added more missing PBOPREFIX files 2015-05-11 17:43:48 +02:00
compat_hlcmods_ak Elevation and windage can now have different adjustment increments: 2015-05-19 20:13:31 +02:00
compat_hlcmods_aug Added more missing PBOPREFIX files 2015-05-11 17:43:48 +02:00
compat_hlcmods_core Added more missing PBOPREFIX files 2015-05-11 17:43:48 +02:00
compat_hlcmods_fal Added more missing PBOPREFIX files 2015-05-11 17:43:48 +02:00
compat_hlcmods_g3 Added more missing PBOPREFIX files 2015-05-11 17:43:48 +02:00
compat_hlcmods_m14 Added more missing PBOPREFIX files 2015-05-11 17:43:48 +02:00
compat_hlcmods_m60e4 Added more missing PBOPREFIX files 2015-05-11 17:43:48 +02:00
compat_rh_acc Elevation and windage can now have different adjustment increments: 2015-05-19 20:13:31 +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 Elevation and windage can now have different adjustment increments: 2015-05-19 20:13:31 +02:00
compat_rhs_usf3 Merge remote-tracking branch 'origin/release' into master-fix 2015-05-20 19:31:55 +02:00
compat_rksl_pm_ii Elevation and windage can now have different adjustment increments: 2015-05-19 20:13:31 +02:00
compat_sma3_iansky Elevation and windage can now have different adjustment increments: 2015-05-19 20:13:31 +02:00
server No really, change it. 2015-05-11 09:03:09 -07:00
userconfig/ace Update serverconfig.hpp 2015-04-04 22:58:14 +02:00