From 05a4d869e66ad1fe09613e1581d0c5f8428177dc Mon Sep 17 00:00:00 2001
From: Frank Morgner <morgner@informatik.hu-berlin.de>
Date: Sat, 18 Jul 2015 04:47:21 +0200
Subject: [PATCH] remove intellij project files

... since they give a lot of conflicts
---
 .gitignore                                    |   5 +
 ACardEmulator/.gitignore                      |   6 -
 ACardEmulator/.idea/compiler.xml              |  23 ----
 .../.idea/copyright/profiles_settings.xml     |   3 -
 ACardEmulator/.idea/encodings.xml             |   5 -
 ACardEmulator/.idea/gradle.xml                |  19 ---
 ACardEmulator/.idea/misc.xml                  |  13 --
 ACardEmulator/.idea/modules.xml               |  10 --
 ACardEmulator/.idea/scopes/scope_settings.xml |   5 -
 ACardEmulator/.idea/vcs.xml                   |   7 --
 remote-reader/.gitignore                      |   4 -
 remote-reader/.idea/.name                     |   1 -
 remote-reader/.idea/compiler.xml              |  23 ----
 .../.idea/copyright/profiles_settings.xml     |   3 -
 remote-reader/.idea/encodings.xml             |   5 -
 remote-reader/.idea/gradle.xml                |  18 ---
 .../inspectionProfiles/Project_Default.xml    |   9 --
 .../inspectionProfiles/profiles_settings.xml  |   7 --
 .../.idea/libraries/appcompat_v7_19_1_0.xml   |  10 --
 .../.idea/libraries/support_v4_19_1_0.xml     |  11 --
 remote-reader/.idea/misc.xml                  | 118 ------------------
 remote-reader/.idea/modules.xml               |  11 --
 remote-reader/.idea/scopes/scope_settings.xml |   5 -
 remote-reader/.idea/vcs.xml                   |   8 --
 24 files changed, 5 insertions(+), 324 deletions(-)
 delete mode 100644 ACardEmulator/.gitignore
 delete mode 100644 ACardEmulator/.idea/compiler.xml
 delete mode 100644 ACardEmulator/.idea/copyright/profiles_settings.xml
 delete mode 100644 ACardEmulator/.idea/encodings.xml
 delete mode 100644 ACardEmulator/.idea/gradle.xml
 delete mode 100644 ACardEmulator/.idea/misc.xml
 delete mode 100644 ACardEmulator/.idea/modules.xml
 delete mode 100644 ACardEmulator/.idea/scopes/scope_settings.xml
 delete mode 100644 ACardEmulator/.idea/vcs.xml
 delete mode 100644 remote-reader/.gitignore
 delete mode 100644 remote-reader/.idea/.name
 delete mode 100644 remote-reader/.idea/compiler.xml
 delete mode 100644 remote-reader/.idea/copyright/profiles_settings.xml
 delete mode 100644 remote-reader/.idea/encodings.xml
 delete mode 100644 remote-reader/.idea/gradle.xml
 delete mode 100644 remote-reader/.idea/inspectionProfiles/Project_Default.xml
 delete mode 100644 remote-reader/.idea/inspectionProfiles/profiles_settings.xml
 delete mode 100644 remote-reader/.idea/libraries/appcompat_v7_19_1_0.xml
 delete mode 100644 remote-reader/.idea/libraries/support_v4_19_1_0.xml
 delete mode 100644 remote-reader/.idea/misc.xml
 delete mode 100644 remote-reader/.idea/modules.xml
 delete mode 100644 remote-reader/.idea/scopes/scope_settings.xml
 delete mode 100644 remote-reader/.idea/vcs.xml

diff --git a/.gitignore b/.gitignore
index 03f0ac7..710ba2e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -74,3 +74,8 @@ virtualsmartcard/win32/vpcd-config/Debug
 virtualsmartcard/win32/vpcd-config/vpcd-config.v12.suo
 npa/opensc.conf
 remote-reader/build/*
+
+.DS_Store
+.idea
+.gradle
+local.properties
diff --git a/ACardEmulator/.gitignore b/ACardEmulator/.gitignore
deleted file mode 100644
index afbdab3..0000000
--- a/ACardEmulator/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.gradle
-/local.properties
-/.idea/workspace.xml
-/.idea/libraries
-.DS_Store
-/build
diff --git a/ACardEmulator/.idea/compiler.xml b/ACardEmulator/.idea/compiler.xml
deleted file mode 100644
index 217af47..0000000
--- a/ACardEmulator/.idea/compiler.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-    <resourceExtensions />
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-    </wildcardResourcePatterns>
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-    </annotationProcessing>
-  </component>
-</project>
-
diff --git a/ACardEmulator/.idea/copyright/profiles_settings.xml b/ACardEmulator/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index e7bedf3..0000000
--- a/ACardEmulator/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
\ No newline at end of file
diff --git a/ACardEmulator/.idea/encodings.xml b/ACardEmulator/.idea/encodings.xml
deleted file mode 100644
index e206d70..0000000
--- a/ACardEmulator/.idea/encodings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
-</project>
-
diff --git a/ACardEmulator/.idea/gradle.xml b/ACardEmulator/.idea/gradle.xml
deleted file mode 100644
index fe865d3..0000000
--- a/ACardEmulator/.idea/gradle.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleSettings">
-    <option name="linkedExternalProjectsSettings">
-      <GradleProjectSettings>
-        <option name="distributionType" value="LOCAL" />
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-2.2.1" />
-        <option name="modules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/app" />
-          </set>
-        </option>
-      </GradleProjectSettings>
-    </option>
-  </component>
-</project>
-
diff --git a/ACardEmulator/.idea/misc.xml b/ACardEmulator/.idea/misc.xml
deleted file mode 100644
index c6052d1..0000000
--- a/ACardEmulator/.idea/misc.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="EntryPointsManager">
-    <entry_points version="2.0" />
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/build/classes" />
-  </component>
-  <component name="SvnBranchConfigurationManager">
-    <option name="mySupportsUserInfoFilter" value="true" />
-  </component>
-</project>
-
diff --git a/ACardEmulator/.idea/modules.xml b/ACardEmulator/.idea/modules.xml
deleted file mode 100644
index d7d75bd..0000000
--- a/ACardEmulator/.idea/modules.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/ACardEmulator.iml" filepath="$PROJECT_DIR$/ACardEmulator.iml" />
-      <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
-    </modules>
-  </component>
-</project>
-
diff --git a/ACardEmulator/.idea/scopes/scope_settings.xml b/ACardEmulator/.idea/scopes/scope_settings.xml
deleted file mode 100644
index 922003b..0000000
--- a/ACardEmulator/.idea/scopes/scope_settings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="DependencyValidationManager">
-  <state>
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/ACardEmulator/.idea/vcs.xml b/ACardEmulator/.idea/vcs.xml
deleted file mode 100644
index 21cbaa6..0000000
--- a/ACardEmulator/.idea/vcs.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
-  </component>
-</project>
-
diff --git a/remote-reader/.gitignore b/remote-reader/.gitignore
deleted file mode 100644
index d6bfc95..0000000
--- a/remote-reader/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-.gradle
-/local.properties
-/.idea/workspace.xml
-.DS_Store
diff --git a/remote-reader/.idea/.name b/remote-reader/.idea/.name
deleted file mode 100644
index 3303b92..0000000
--- a/remote-reader/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-RemoteSmartCardReader
diff --git a/remote-reader/.idea/compiler.xml b/remote-reader/.idea/compiler.xml
deleted file mode 100644
index 217af47..0000000
--- a/remote-reader/.idea/compiler.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-    <resourceExtensions />
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-    </wildcardResourcePatterns>
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-    </annotationProcessing>
-  </component>
-</project>
-
diff --git a/remote-reader/.idea/copyright/profiles_settings.xml b/remote-reader/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index e7bedf3..0000000
--- a/remote-reader/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
\ No newline at end of file
diff --git a/remote-reader/.idea/encodings.xml b/remote-reader/.idea/encodings.xml
deleted file mode 100644
index e206d70..0000000
--- a/remote-reader/.idea/encodings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
-</project>
-
diff --git a/remote-reader/.idea/gradle.xml b/remote-reader/.idea/gradle.xml
deleted file mode 100644
index 736c7b5..0000000
--- a/remote-reader/.idea/gradle.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleSettings">
-    <option name="linkedExternalProjectsSettings">
-      <GradleProjectSettings>
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="modules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/app" />
-          </set>
-        </option>
-      </GradleProjectSettings>
-    </option>
-  </component>
-</project>
-
diff --git a/remote-reader/.idea/inspectionProfiles/Project_Default.xml b/remote-reader/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 4b46a2f..0000000
--- a/remote-reader/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0" is_locked="false">
-    <option name="myName" value="Project Default" />
-    <option name="myLocal" value="false" />
-    <inspection_tool class="AndroidLintNewApi" enabled="false" level="ERROR" enabled_by_default="false" />
-    <inspection_tool class="AndroidLintNotSibling" enabled="false" level="ERROR" enabled_by_default="false" />
-    <inspection_tool class="AndroidLintOrientation" enabled="false" level="ERROR" enabled_by_default="false" />
-  </profile>
-</component>
\ No newline at end of file
diff --git a/remote-reader/.idea/inspectionProfiles/profiles_settings.xml b/remote-reader/.idea/inspectionProfiles/profiles_settings.xml
deleted file mode 100644
index 3b31283..0000000
--- a/remote-reader/.idea/inspectionProfiles/profiles_settings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <settings>
-    <option name="PROJECT_PROFILE" value="Project Default" />
-    <option name="USE_PROJECT_PROFILE" value="true" />
-    <version value="1.0" />
-  </settings>
-</component>
\ No newline at end of file
diff --git a/remote-reader/.idea/libraries/appcompat_v7_19_1_0.xml b/remote-reader/.idea/libraries/appcompat_v7_19_1_0.xml
deleted file mode 100644
index 700d529..0000000
--- a/remote-reader/.idea/libraries/appcompat_v7_19_1_0.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
-  <library name="appcompat-v7-19.1.0">
-    <CLASSES>
-      <root url="file://$PROJECT_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/19.1.0/res" />
-      <root url="jar://$PROJECT_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/19.1.0/classes.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/remote-reader/.idea/libraries/support_v4_19_1_0.xml b/remote-reader/.idea/libraries/support_v4_19_1_0.xml
deleted file mode 100644
index 3f6ff2d..0000000
--- a/remote-reader/.idea/libraries/support_v4_19_1_0.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="support-v4-19.1.0">
-    <CLASSES>
-      <root url="jar://$APPLICATION_HOME_DIR$/sdk/extras/android/m2repository/com/android/support/support-v4/19.1.0/support-v4-19.1.0.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$APPLICATION_HOME_DIR$/sdk/extras/android/m2repository/com/android/support/support-v4/19.1.0/support-v4-19.1.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/remote-reader/.idea/misc.xml b/remote-reader/.idea/misc.xml
deleted file mode 100644
index 6b4dc25..0000000
--- a/remote-reader/.idea/misc.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="DaemonCodeAnalyzer">
-    <disable_hints />
-  </component>
-  <component name="EntryPointsManager">
-    <entry_points version="2.0" />
-  </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
-    <OptionsSetting value="true" id="Add" />
-    <OptionsSetting value="true" id="Remove" />
-    <OptionsSetting value="true" id="Checkout" />
-    <OptionsSetting value="true" id="Update" />
-    <OptionsSetting value="true" id="Status" />
-    <OptionsSetting value="true" id="Edit" />
-    <ConfirmationsSetting value="0" id="Add" />
-    <ConfirmationsSetting value="0" id="Remove" />
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/build/classes" />
-  </component>
-  <component name="RunManager">
-    <configuration default="true" type="Remote" factoryName="Remote">
-      <option name="USE_SOCKET_TRANSPORT" value="true" />
-      <option name="SERVER_MODE" value="false" />
-      <option name="SHMEM_ADDRESS" value="javadebug" />
-      <option name="HOST" value="localhost" />
-      <option name="PORT" value="5005" />
-      <method />
-    </configuration>
-    <configuration default="true" type="TestNG" factoryName="TestNG">
-      <module name="" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="SUITE_NAME" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="GROUP_NAME" />
-      <option name="TEST_OBJECT" value="CLASS" />
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="OUTPUT_DIRECTORY" />
-      <option name="ANNOTATION_TYPE" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="moduleWithDependencies" />
-      </option>
-      <option name="USE_DEFAULT_REPORTERS" value="false" />
-      <option name="PROPERTIES_FILE" />
-      <envs />
-      <properties />
-      <listeners />
-      <method />
-    </configuration>
-    <configuration default="true" type="Applet" factoryName="Applet">
-      <module name="" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="HTML_FILE_NAME" />
-      <option name="HTML_USED" value="false" />
-      <option name="WIDTH" value="400" />
-      <option name="HEIGHT" value="300" />
-      <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
-      <option name="VM_PARAMETERS" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <method />
-    </configuration>
-    <configuration default="true" type="Application" factoryName="Application">
-      <option name="MAIN_CLASS_NAME" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="ENABLE_SWING_INSPECTOR" value="false" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <module name="" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="JUnit" factoryName="JUnit">
-      <module name="" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="TEST_OBJECT" value="class" />
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="moduleWithDependencies" />
-      </option>
-      <envs />
-      <patterns />
-      <method />
-    </configuration>
-    <list size="0" />
-    <configuration name="&lt;template&gt;" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" default="true" selected="false">
-      <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
-    </configuration>
-    <configuration name="&lt;template&gt;" type="WebApp" default="true" selected="false">
-      <Host>localhost</Host>
-      <Port>5050</Port>
-    </configuration>
-  </component>
-  <component name="SvnBranchConfigurationManager">
-    <option name="mySupportsUserInfoFilter" value="true" />
-  </component>
-</project>
-
diff --git a/remote-reader/.idea/modules.xml b/remote-reader/.idea/modules.xml
deleted file mode 100644
index 857d7f8..0000000
--- a/remote-reader/.idea/modules.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/RemoteSmartCardReader.iml" filepath="$PROJECT_DIR$/RemoteSmartCardReader.iml" />
-      <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
-      <module fileurl="file://$PROJECT_DIR$/remote-reader.iml" filepath="$PROJECT_DIR$/remote-reader.iml" />
-    </modules>
-  </component>
-</project>
-
diff --git a/remote-reader/.idea/scopes/scope_settings.xml b/remote-reader/.idea/scopes/scope_settings.xml
deleted file mode 100644
index 922003b..0000000
--- a/remote-reader/.idea/scopes/scope_settings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="DependencyValidationManager">
-  <state>
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/remote-reader/.idea/vcs.xml b/remote-reader/.idea/vcs.xml
deleted file mode 100644
index f1d5981..0000000
--- a/remote-reader/.idea/vcs.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="svn" />
-    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
-  </component>
-</project>
-