From e3ed81173611f282c016f092c78e76cdec254fd4 Mon Sep 17 00:00:00 2001
From: PabstMirror <elephantisaterriblemascot@gmail.com>
Date: Mon, 12 Jan 2015 03:17:29 -0600
Subject: [PATCH 1/2] Little Fixes to get it compiling

---
 addons/ai/config.cpp              | 2 +-
 addons/attach/config.cpp          | 2 +-
 addons/core/script_component.hpp  | 4 ++--
 addons/main/script_macros.hpp     | 2 +-
 addons/wep_dragon/CfgVehicles.hpp | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/ai/config.cpp b/addons/ai/config.cpp
index 5e1264d418..d2c9983349 100644
--- a/addons/ai/config.cpp
+++ b/addons/ai/config.cpp
@@ -5,7 +5,7 @@ class CfgPatches {
     units[] = {};
     weapons[] = {};
     requiredVersion = 0.60;
-    requiredAddons[] = {AGM_Core};
+    requiredAddons[] = {"ace_core"};
     version = "0.95";
     versionStr = "0.95";
     versionAr[] = {0,95,0};
diff --git a/addons/attach/config.cpp b/addons/attach/config.cpp
index c5054ebd6e..f27d675efb 100644
--- a/addons/attach/config.cpp
+++ b/addons/attach/config.cpp
@@ -53,7 +53,7 @@ class CfgVehicles {
         };
         class GVAR(Detach) {
           displayName = "$STR_AGM_Attach_Detach";
-          condition = QUOTE( [_player] call FUNC(canDetach );
+          condition = QUOTE( [_player] call FUNC(canDetach) );
           statement = QUOTE( [_player] call FUNC(detach) );
           exceptions[] = {"AGM_Drag_isNotDragging"};
           showDisabled = 0;
diff --git a/addons/core/script_component.hpp b/addons/core/script_component.hpp
index d25bdff864..f1ba87246c 100644
--- a/addons/core/script_component.hpp
+++ b/addons/core/script_component.hpp
@@ -1,5 +1,5 @@
 #define COMPONENT core
-#include "script_mod.hpp"
+#include "\z\ace\addons\main\script_mod.hpp"
 
 // #define DEBUG_MODE_FULL
 
@@ -11,4 +11,4 @@
 	#define DEBUG_SETTINGS DEBUG_SETTINGS_MAIN
 #endif
 
-#include "script_macros.hpp"
+#include "\z\ace\addons\main\script_macros.hpp"
\ No newline at end of file
diff --git a/addons/main/script_macros.hpp b/addons/main/script_macros.hpp
index 3dd2b1ba92..7811c32337 100644
--- a/addons/main/script_macros.hpp
+++ b/addons/main/script_macros.hpp
@@ -47,7 +47,7 @@
 #define ACE_NOGRIP handAnim[] = {}
 #define ACE_DISTANCE_DEFAULT distanceZoomMin = 300; distanceZoomMax = 300
 
-#include "script_macros_optics.hpp"
+// #include "script_macros_optics.hpp" //ToDo
 
 #define ACE_NOZEROING discreteDistance[] = {}; \
 			discreteDistanceInitIndex = 0; \
diff --git a/addons/wep_dragon/CfgVehicles.hpp b/addons/wep_dragon/CfgVehicles.hpp
index ec8e60a23f..5e5682e9c6 100644
--- a/addons/wep_dragon/CfgVehicles.hpp
+++ b/addons/wep_dragon/CfgVehicles.hpp
@@ -17,7 +17,7 @@ class CfgVehicles {
 				class ViewOptics;
 			};
 		};
-	}
+	};
 
 	class ACE_M47_Static: ACE_M47_Static_Base {
 		scope = 1; // Hide it for now

From 6f4d274d1bbab820bdebe75b32e00810267f1964 Mon Sep 17 00:00:00 2001
From: Felix Wiegand <koffeinflummi@gmail.com>
Date: Mon, 12 Jan 2015 11:14:20 +0100
Subject: [PATCH 2/2] Add vim files and texHeaders to gitignore

---
 .gitignore | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index a067f29817..70f252396b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 *.pbo
-
+texHeaders.bin
+*.swp
+*.swo