From b0cc6826b41523d7f3439d3f25dfc706cef19a23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Mon, 23 Nov 2015 21:06:17 +0100
Subject: [PATCH] Include the project's code style, fixed invalid .idea
 directory being ignored

---
 .gitignore                  |  3 ++-
 .idea/codeStyleSettings.xml | 13 +++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 .idea/codeStyleSettings.xml

diff --git a/.gitignore b/.gitignore
index e0d930e9d..de0c25c5c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,9 +19,10 @@ hs_err_pid*
 *.iml
 
 ## Directory-based project format:
-.idea/
+.idea/*
 # Include the project's code style settings file
 !.idea/codeStyleSettings.xml
+
 # if you remove the above rule, at least ignore the following:
 
 # User-specific stuff:
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
new file mode 100644
index 000000000..84c6b86a0
--- /dev/null
+++ b/.idea/codeStyleSettings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectCodeStyleSettingsManager">
+    <option name="PER_PROJECT_SETTINGS">
+      <value>
+        <XML>
+          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
+        </XML>
+      </value>
+    </option>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </component>
+</project>
\ No newline at end of file