diff options
author | Simon Rettberg | 2019-07-30 16:07:15 +0200 |
---|---|---|
committer | Simon Rettberg | 2019-07-30 16:07:15 +0200 |
commit | 813ac136e48f60d4c2b13e808107870dafcc4d52 (patch) | |
tree | 396a6c98276f6e9a04216933daebdf3af7b81d46 /android/xscreensaver/xscreensaver.iml | |
parent | Flush X events before locking if we have an external ungrab command (diff) | |
parent | Update to 5.43 (diff) | |
download | xscreensaver-813ac136e48f60d4c2b13e808107870dafcc4d52.tar.gz xscreensaver-813ac136e48f60d4c2b13e808107870dafcc4d52.tar.xz xscreensaver-813ac136e48f60d4c2b13e808107870dafcc4d52.zip |
Merge branch 'master' into openslx (5.43)
Diffstat (limited to 'android/xscreensaver/xscreensaver.iml')
-rw-r--r-- | android/xscreensaver/xscreensaver.iml | 117 |
1 files changed, 0 insertions, 117 deletions
diff --git a/android/xscreensaver/xscreensaver.iml b/android/xscreensaver/xscreensaver.iml deleted file mode 100644 index 18e9fb0..0000000 --- a/android/xscreensaver/xscreensaver.iml +++ /dev/null @@ -1,117 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<module external.linked.project.id=":xscreensaver" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4"> - <component name="FacetManager"> - <facet type="android-gradle" name="Android-Gradle"> - <configuration> - <option name="GRADLE_PROJECT_PATH" value=":xscreensaver" /> - </configuration> - </facet> - <facet type="android" name="Android"> - <configuration> - <option name="SELECTED_BUILD_VARIANT" value="debug" /> - <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" /> - <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" /> - <afterSyncTasks> - <task>generateDebugSources</task> - </afterSyncTasks> - <option name="ALLOW_USER_CONFIGURATION" value="false" /> - <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/res" /> - </configuration> - </facet> - </component> - <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7"> - <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" /> - <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" /> - <exclude-output /> - <content url="file://$MODULE_DIR$"> - <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" /> - <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" /> - <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" /> - <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" /> - <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" /> - <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" /> - <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" /> - <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" /> - <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" /> - <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" /> - <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" /> - <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" /> - <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" /> - <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" /> - <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" /> - <sourceFolder url="file://$MODULE_DIR$/build-types/debug/res" type="java-resource" /> - <sourceFolder url="file://$MODULE_DIR$/build-types/debug/resources" type="java-resource" /> - <sourceFolder url="file://$MODULE_DIR$/build-types/debug/assets" type="java-resource" /> - <sourceFolder url="file://$MODULE_DIR$/build-types/debug/aidl" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/build-types/debug/java" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/build-types/debug/rs" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/build-types/debug/shaders" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" /> - <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" /> - <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" /> - <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" /> - <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" /> - <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" /> - <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/res" type="java-resource" /> - <sourceFolder url="file://$MODULE_DIR$/src" type="java-resource" /> - <sourceFolder url="file://$MODULE_DIR$/assets" type="java-resource" /> - <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" /> - <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" /> - <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" /> - <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/tests/res" type="java-test-resource" /> - <sourceFolder url="file://$MODULE_DIR$/tests/resources" type="java-test-resource" /> - <sourceFolder url="file://$MODULE_DIR$/tests/assets" type="java-test-resource" /> - <sourceFolder url="file://$MODULE_DIR$/tests/aidl" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/tests/java" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/tests/rs" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/tests/shaders" isTestSource="true" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" /> - <excludeFolder url="file://$MODULE_DIR$/build/outputs" /> - <excludeFolder url="file://$MODULE_DIR$/build/reports" /> - <excludeFolder url="file://$MODULE_DIR$/build/tmp" /> - </content> - <orderEntry type="jdk" jdkName="Android API 27 Platform" jdkType="Android SDK" /> - <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="library" name="Gradle: com.android.support:support-v4-27.1.1" level="project" /> - <orderEntry type="library" name="Gradle: android.arch.lifecycle:common:1.1.0@jar" level="project" /> - <orderEntry type="library" name="Gradle: com.android.support:support-fragment-27.1.1" level="project" /> - <orderEntry type="library" name="Gradle: com.android.support:support-annotations:27.1.1@jar" level="project" /> - <orderEntry type="library" name="Gradle: android.arch.core:runtime-1.1.0" level="project" /> - <orderEntry type="library" name="Gradle: com.android.support:support-compat-27.1.1" level="project" /> - <orderEntry type="library" name="Gradle: android.arch.lifecycle:viewmodel-1.1.0" level="project" /> - <orderEntry type="library" name="Gradle: android.arch.lifecycle:livedata-core-1.1.0" level="project" /> - <orderEntry type="library" name="Gradle: com.android.support:support-media-compat-27.1.1" level="project" /> - <orderEntry type="library" name="Gradle: com.android.support:support-core-ui-27.1.1" level="project" /> - <orderEntry type="library" name="Gradle: android.arch.core:common:1.1.0@jar" level="project" /> - <orderEntry type="library" name="Gradle: com.android.support:support-core-utils-27.1.1" level="project" /> - <orderEntry type="library" name="Gradle: android.arch.lifecycle:runtime-1.1.0" level="project" /> - </component> -</module>
\ No newline at end of file |