From 005dd85fdc475c6af0b981a91c758fc41123cf25 Mon Sep 17 00:00:00 2001 From: Jorge Antonio Diaz-Benito Soriano Date: Mon, 24 Nov 2014 12:02:35 +0100 Subject: [PATCH] Update .gitignore and readded missing files --- .gitignore | 14 +++-- .idea/.name | 1 + .idea/compiler.xml | 23 +++++++ .idea/copyright/profiles_settings.xml | 3 + .idea/encodings.xml | 5 ++ .idea/misc.xml | 10 +++ .idea/modules.xml | 11 ++++ .idea/scopes/scope_settings.xml | 5 ++ .idea/vcs.xml | 7 +++ android-library.iml | 89 ++++++++++++++++++++++++++ sample_client/sample_client.iml | 88 ++++++++++++++++++++++++++ test_client/test_client.iml | 90 +++++++++++++++++++++++++++ 12 files changed, 341 insertions(+), 5 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-library.iml create mode 100644 sample_client/sample_client.iml create mode 100644 test_client/test_client.iml diff --git a/.gitignore b/.gitignore index 307d00b3..aec42f2f 100644 --- a/.gitignore +++ b/.gitignore @@ -8,16 +8,20 @@ # Java class files *.class -# generated files +# IntelliJ and Gradle specific entries +.gradle +.idea/workspace.xml +.idea/tasks.xml +.idea/libraries/*.xml +dataSources.ids +datasources.xml +gradle.xml +build bin/ -build/ gen/ target/ -*.iml # Local configuration files (sdk path, etc) -.idea/ -.gradle/ local.properties sample_client/local.properties tests/local.properties diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 00000000..72c6cb10 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +android-library \ 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..e28b2784 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + 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-library.iml b/android-library.iml new file mode 100644 index 00000000..0b4d8d7e --- /dev/null +++ b/android-library.iml @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sample_client/sample_client.iml b/sample_client/sample_client.iml new file mode 100644 index 00000000..9a41c0df --- /dev/null +++ b/sample_client/sample_client.iml @@ -0,0 +1,88 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test_client/test_client.iml b/test_client/test_client.iml new file mode 100644 index 00000000..7ab0892d --- /dev/null +++ b/test_client/test_client.iml @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +