aboutsummaryrefslogtreecommitdiff
path: root/xcode/olm.xcworkspace/contents.xcworkspacedata
diff options
context:
space:
mode:
authormanuroe <manu@matrix.org>2016-09-27 08:30:33 +0200
committermanuroe <manu@matrix.org>2016-09-27 08:30:33 +0200
commit1d06f2a4d9565c332081bc685edd8fd61d6507ef (patch)
treece61f13c9347786276238fc36e34dde4d5d32f5a /xcode/olm.xcworkspace/contents.xcworkspacedata
parent8a8d100ee5be5961861e53f8b3b5702e8902af74 (diff)
parentdaab2a58af947cddd67fe9f30dd3a9fc327650c0 (diff)
Merge remote-tracking branch 'OLMKit/olmkit' into olmkit
# Conflicts: # .gitignore # include/olm/olm.hh # javascript/README.md
Diffstat (limited to 'xcode/olm.xcworkspace/contents.xcworkspacedata')
-rw-r--r--xcode/olm.xcworkspace/contents.xcworkspacedata10
1 files changed, 10 insertions, 0 deletions
diff --git a/xcode/olm.xcworkspace/contents.xcworkspacedata b/xcode/olm.xcworkspace/contents.xcworkspacedata
new file mode 100644
index 0000000..3c8fe35
--- /dev/null
+++ b/xcode/olm.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+ version = "1.0">
+ <FileRef
+ location = "group:olm.xcodeproj">
+ </FileRef>
+ <FileRef
+ location = "group:Pods/Pods.xcodeproj">
+ </FileRef>
+</Workspace>