Merge branch 'master' of github.com:zakk4223/CocoaSplit

zakk4223 · Jul 2, 2017 · f3f7f2a · f3f7f2a
2 parents 26395c8 + a7b9fdb
commit f3f7f2a
Show file tree

Hide file tree

Showing 72 changed files with 3 additions and 3,070 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,3 @@
+.DS_Store
+project.xcworkspace/
+xcuserdata/
diff --git a/...turePlugin.xcodeproj/xcuserdata/zakk.xcuserdatad/xcschemes/CSFFMpegCapturePlugin.xcscheme b/...turePlugin.xcodeproj/xcuserdata/zakk.xcuserdatad/xcschemes/CSFFMpegCapturePlugin.xcscheme
diff --git a/...pegCapturePlugin.xcodeproj/xcuserdata/zakk.xcuserdatad/xcschemes/xcschememanagement.plist b/...pegCapturePlugin.xcodeproj/xcuserdata/zakk.xcuserdatad/xcschemes/xcschememanagement.plist
diff --git a/...CapturePlugin.xcodeproj/xcuserdata/zakk.xcuserdatad/xcschemes/CSAVFCapturePlugin.xcscheme b/...CapturePlugin.xcodeproj/xcuserdata/zakk.xcuserdatad/xcschemes/CSAVFCapturePlugin.xcscheme
diff --git a/....xcodeproj/xcuserdata/zakk.xcuserdatad/xcschemes/CSAVFCapturePlugin_BACKUP_26129.xcscheme b/....xcodeproj/xcuserdata/zakk.xcuserdatad/xcschemes/CSAVFCapturePlugin_BACKUP_26129.xcscheme
diff --git a/....xcodeproj/xcuserdata/zakk.xcuserdatad/xcschemes/CSAVFCapturePlugin_BACKUP_26694.xcscheme b/....xcodeproj/xcuserdata/zakk.xcuserdatad/xcschemes/CSAVFCapturePlugin_BACKUP_26694.xcscheme