summaryrefslogtreecommitdiffstats
path: root/OSX/Media-iOS.xcassets/Contents.json
diff options
context:
space:
mode:
authorSimon Rettberg2019-07-30 16:07:15 +0200
committerSimon Rettberg2019-07-30 16:07:15 +0200
commit813ac136e48f60d4c2b13e808107870dafcc4d52 (patch)
tree396a6c98276f6e9a04216933daebdf3af7b81d46 /OSX/Media-iOS.xcassets/Contents.json
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 'OSX/Media-iOS.xcassets/Contents.json')
-rw-r--r--OSX/Media-iOS.xcassets/Contents.json6
1 files changed, 0 insertions, 6 deletions
diff --git a/OSX/Media-iOS.xcassets/Contents.json b/OSX/Media-iOS.xcassets/Contents.json
deleted file mode 100644
index da4a164..0000000
--- a/OSX/Media-iOS.xcassets/Contents.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "info" : {
- "version" : 1,
- "author" : "xcode"
- }
-} \ No newline at end of file