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

Browse Source

Conflicts:
	addons/hearing/CfgSounds.hpp
	addons/hearing/CfgWeapons.hpp
	addons/hearing/script_component.hpp

...

This commit is contained in:

Nicolás Badano 2015-01-13 23:19:00 -03:00

parent 5e4a78a1bc a78f508551

commit cc7d67a150

1 changed files with 0 additions and 0 deletions

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

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

BIN

addons/hearing/ace_earplugs.p3d

View File

Binary file not shown.