From f21b14810b31c8cb50162e7c338ff9ae9532359f Mon Sep 17 00:00:00 2001 From: serso Date: Thu, 12 Feb 2015 12:07:35 +0100 Subject: [PATCH] Changes by Android Studio --- .gitignore | 3 +- .idea/compiler.xml | 3 +- .idea/encodings.xml | 8 ++--- .idea/gradle.xml | 3 +- .idea/misc.xml | 45 ++----------------------- .idea/modules.xml | 3 +- .idea/runConfigurations/Debug.xml | 26 -------------- .idea/vcs.xml | 3 +- android-app-tests/android-app-tests.iml | 37 ++++++++++---------- android-app/android-app.iml | 7 ++-- calculatorpp.iml | 5 +-- core/core.iml | 5 +-- 12 files changed, 46 insertions(+), 102 deletions(-) delete mode 100644 .idea/runConfigurations/Debug.xml diff --git a/.gitignore b/.gitignore index 79c8a51b..dca31695 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,5 @@ atlassian-ide-plugin.xml .idea/tasks.xml .idea/uiDesigner.xml .idea/libraries/ -build \ No newline at end of file +build +local.properties \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 9a8b7e5c..217af471 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -19,4 +19,5 @@ - \ No newline at end of file + + diff --git a/.idea/encodings.xml b/.idea/encodings.xml index 13692363..e206d70d 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -1,7 +1,5 @@ - - - - - \ No newline at end of file + + + diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 35db5fb0..0d7d4561 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -18,4 +18,5 @@ - \ No newline at end of file + + diff --git a/.idea/misc.xml b/.idea/misc.xml index 41c22422..92954b82 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,42 +1,11 @@ - - - - - - - - - - - - - - - - - - - - @@ -199,4 +157,5 @@ - \ No newline at end of file + + diff --git a/.idea/modules.xml b/.idea/modules.xml index b44e84c8..99134cac 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -8,4 +8,5 @@ - \ No newline at end of file + + diff --git a/.idea/runConfigurations/Debug.xml b/.idea/runConfigurations/Debug.xml deleted file mode 100644 index 4e3c720a..00000000 --- a/.idea/runConfigurations/Debug.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 83067447..276779e8 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -4,4 +4,5 @@ - \ No newline at end of file + + diff --git a/android-app-tests/android-app-tests.iml b/android-app-tests/android-app-tests.iml index ad249d00..06d823d7 100644 --- a/android-app-tests/android-app-tests.iml +++ b/android-app-tests/android-app-tests.iml @@ -1,5 +1,5 @@ - + @@ -31,6 +31,8 @@ + + @@ -42,7 +44,6 @@ - @@ -71,38 +72,40 @@ + + + - - + + + + + - + - - - + + + + - - - - - - - - + + - \ No newline at end of file + + diff --git a/android-app/android-app.iml b/android-app/android-app.iml index 1e7c9b97..f21746b2 100644 --- a/android-app/android-app.iml +++ b/android-app/android-app.iml @@ -1,5 +1,5 @@ - + @@ -9,6 +9,7 @@ + @@ -114,4 +116,5 @@ - \ No newline at end of file + + diff --git a/calculatorpp.iml b/calculatorpp.iml index 3edd6408..0bb6048a 100644 --- a/calculatorpp.iml +++ b/calculatorpp.iml @@ -1,5 +1,5 @@ - + @@ -15,4 +15,5 @@ - \ No newline at end of file + + diff --git a/core/core.iml b/core/core.iml index 22ed83ea..89e82795 100644 --- a/core/core.iml +++ b/core/core.iml @@ -1,5 +1,5 @@ - + @@ -42,4 +42,5 @@ - \ No newline at end of file + +