summaryrefslogtreecommitdiffstats
path: root/android/xscreensaver/local.properties
diff options
context:
space:
mode:
authorSimon Rettberg2019-07-30 16:07:15 +0200
committerSimon Rettberg2019-07-30 16:07:15 +0200
commit813ac136e48f60d4c2b13e808107870dafcc4d52 (patch)
tree396a6c98276f6e9a04216933daebdf3af7b81d46 /android/xscreensaver/local.properties
parentFlush X events before locking if we have an external ungrab command (diff)
parentUpdate to 5.43 (diff)
downloadxscreensaver-813ac136e48f60d4c2b13e808107870dafcc4d52.tar.gz
xscreensaver-813ac136e48f60d4c2b13e808107870dafcc4d52.tar.xz
xscreensaver-813ac136e48f60d4c2b13e808107870dafcc4d52.zip
Merge branch 'master' into openslx (5.43)
Diffstat (limited to 'android/xscreensaver/local.properties')
-rw-r--r--android/xscreensaver/local.properties11
1 files changed, 0 insertions, 11 deletions
diff --git a/android/xscreensaver/local.properties b/android/xscreensaver/local.properties
deleted file mode 100644
index d530e0d..0000000
--- a/android/xscreensaver/local.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-## This file is automatically generated by Android Studio.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must *NOT* be checked into Version Control Systems,
-# as it contains information specific to your local configuration.
-#
-# Location of the SDK. This is only used by Gradle.
-# For customization when using a Version Control System, please read the
-# header note.
-#Mon Oct 03 16:09:56 PDT 2016
-sdk.dir=/Users/jwz/Library/Android/sdk