gienkov c1a7374404 Merge remote-tracking branch 'upstream/master' into pl-translation-1 ...

Conflicts:
	addons/interact_menu/stringtable.xml

2015-06-05 09:40:50 +02:00

..

functions

using new string macros

2015-06-04 19:33:19 +01:00

ui

Added icon to unconscious module

2015-06-01 20:56:58 +01:00

$PBOPREFIX$

added zeus changes module

2015-05-09 20:24:39 +01:00

ACE_Settings.hpp

Use existing disabled string

2015-06-04 19:40:11 +01:00

CfgEventHandlers.hpp

added zeus changes module

2015-05-09 20:24:39 +01:00

CfgVehicles.hpp

Use existing disabled string

2015-06-04 19:40:11 +01:00

config.cpp

Better module naming convention

2015-06-01 20:56:56 +01:00

script_component.hpp

Disable zeus settings by default

2015-05-11 18:15:45 +01:00

stringtable.xml

Merge remote-tracking branch 'upstream/master' into pl-translation-1

2015-06-05 09:40:50 +02:00

XEH_preInit.sqf

Better module naming convention

2015-06-01 20:56:56 +01:00