Merge branch 'ATragMX' of https://github.com/KoffeinFlummi/ACE3 into ATragMX

Browse Source

Conflicts:
	addons/atragmx/RscTitles.hpp
	addons/atragmx/functions/fnc_calculate_solution.sqf
	addons/atragmx/functions/fnc_calculate_target_range_assist.sqf
	addons/atragmx/functions/fnc_target_speed_assist_timer.sqf

...

This commit is contained in:

ulteq

2015-04-08 11:08:28 +02:00

parent 15a594ccbc 2d211e839f

commit 78bb9193be

4 changed files with 215 additions and 392 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

485

addons/atragmx/RscTitles.hpp

File diff suppressed because it is too large Load Diff