From 3f468100b4a6840b34dd579030b1223c6128e2ba Mon Sep 17 00:00:00 2001
From: Ali Smesseim <smesseim.ali@gmail.com>
Date: Wed, 2 Oct 2013 20:05:49 +0200
Subject: [PATCH] Change Android.gitignore to comply with JetBrains standards

Serge Baranov, a JetBrains employee, has stated that all .ipr and all .iml should be checked in in version control. Also the .idea folder has to be checked in, except for the workspace.xml and tasks.xml files.

Source: http://devnet.jetbrains.com/docs/DOC-1186
---
 Android.gitignore | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Android.gitignore b/Android.gitignore
index 87a44e0e..cd5b45bb 100644
--- a/Android.gitignore
+++ b/Android.gitignore
@@ -23,8 +23,6 @@ local.properties
 proguard/
 
 # Intellij project files
-*.iml
-*.ipr
 *.iws
-.idea/
-
+.idea/workspace.xml
+.idea/tasks.xml