Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

manual merge

Browse Source
This commit is contained in:
commy2 2016-02-22 16:11:10 +01:00
parent ac3385fb83
commit 72fe155cda
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
addons/mk6mortar/CfgEventHandlers.hpp
View File

@ -17,15 +17,12 @@ class Extended_PostInit_EventHandlers {
}; };
}; };
<<<<<<< HEAD
class Extended_DisplayLoad_EventHandlers { class Extended_DisplayLoad_EventHandlers {
class RscUnitInfo { class RscUnitInfo {
ADDON = QUOTE(_this call FUNC(turretDisplayLoaded)); ADDON = QUOTE(_this call FUNC(turretDisplayLoaded));
}; };
}; };
=======
>>>>>>> 0f7bfc0f6654cef08f84b36fbc4fd4be2774777b
class Extended_FiredBIS_EventHandlers { class Extended_FiredBIS_EventHandlers {
class Mortar_01_base_F { class Mortar_01_base_F {
class ADDON { class ADDON {