From 65aeb8728ba48bdbba766970330efe48a8f27cc0 Mon Sep 17 00:00:00 2001 From: Jorge Antonio Diaz-Benito Soriano Date: Mon, 24 Nov 2014 11:57:01 +0100 Subject: [PATCH] Update .gitignore and re-add missing files --- .gitignore | 11 +++-- .idea/.name | 1 + .idea/compiler.xml | 23 +++++++++ .idea/copyright/profiles_settings.xml | 3 ++ .idea/encodings.xml | 5 ++ .idea/misc.xml | 10 ++++ .idea/modules.xml | 10 ++++ .idea/scopes/scope_settings.xml | 5 ++ .idea/vcs.xml | 7 +++ android.iml | 92 +++++++++++++++++++++++++++++++++++ 10 files changed, 163 insertions(+), 4 deletions(-) create mode 100644 .idea/.name create mode 100644 .idea/compiler.xml create mode 100644 .idea/copyright/profiles_settings.xml create mode 100644 .idea/encodings.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/scopes/scope_settings.xml create mode 100644 .idea/vcs.xml create mode 100644 android.iml diff --git a/.gitignore b/.gitignore index a218d0b9..e13e5a5e 100644 --- a/.gitignore +++ b/.gitignore @@ -11,7 +11,6 @@ # generated files bin/ build/ -*.iml gen/ target/ @@ -32,10 +31,14 @@ oc_framework/proguard-project.txt oc_framework-test-project/proguard-project.txt tests/proguard-project.txt -# Android Studio and Gradle specific entries +# IntelliJ and Gradle specific entries .gradle -.idea -*.iml +.idea/workspace.xml +.idea/tasks.xml +.idea/libraries/*.xml +dataSources.ids +datasources.xml +gradle.xml build # Actionbarsherlock is now ignored since scripts takes care of init the sub-modules. diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 00000000..1fd74d19 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +android \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 00000000..217af471 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 00000000..e7bedf33 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 00000000..e206d70d --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 00000000..b153e48a --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 00000000..92fbe54f --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 00000000..922003b8 --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 00000000..275077f8 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/android.iml b/android.iml new file mode 100644 index 00000000..4d0d9af2 --- /dev/null +++ b/android.iml @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- 2.11.0