Merge branch 'master' of github.com:QuickBlox/quickblox-ios-sdk

QuickBlox · Oct 20, 2014 · 02b1628 · 02b1628
2 parents aa47e42 + ba3d9e1
commit 02b1628
Show file tree

Hide file tree

Showing 41 changed files with 1,186 additions and 910 deletions.
diff --git a/sample-videochat-customsession/Podfile b/sample-videochat-customsession/Podfile
@@ -1,4 +1,5 @@
-platform :ios, '6.0'
 
+source 'https://github.com/CocoaPods/Specs.git'
+platform :ios, '6.0'
 pod 'libextobjc/EXTScope'
 pod 'MTBlockAlertView'
diff --git a/sample-videochat-customsession/Podfile.lock b/sample-videochat-customsession/Podfile.lock
@@ -12,4 +12,4 @@ SPEC CHECKSUMS:
   libextobjc: ba42e4111f433273a886cd54f0ddaddb7f62f82f
   MTBlockAlertView: bd376f8b9f0ea945ed21e4c75aa0bb9afe3e782d
 
-COCOAPODS: 0.33.1
+COCOAPODS: 0.34.2
diff --git a/sample-videochat-customsession/Pods/BuildHeaders/MTBlockAlertView/MTBlockAlertView.h b/sample-videochat-customsession/Pods/BuildHeaders/MTBlockAlertView/MTBlockAlertView.h
diff --git a/sample-videochat-customsession/Pods/BuildHeaders/libextobjc/EXTRuntimeExtensions.h b/sample-videochat-customsession/Pods/BuildHeaders/libextobjc/EXTRuntimeExtensions.h
diff --git a/sample-videochat-customsession/Pods/BuildHeaders/libextobjc/EXTScope.h b/sample-videochat-customsession/Pods/BuildHeaders/libextobjc/EXTScope.h
diff --git a/sample-videochat-customsession/Pods/BuildHeaders/libextobjc/metamacros.h b/sample-videochat-customsession/Pods/BuildHeaders/libextobjc/metamacros.h
diff --git a/sample-videochat-customsession/Pods/Headers/MTBlockAlertView/MTBlockAlertView.h b/sample-videochat-customsession/Pods/Headers/MTBlockAlertView/MTBlockAlertView.h
diff --git a/sample-videochat-customsession/Pods/Headers/Public/MTBlockAlertView/MTBlockAlertView.h b/sample-videochat-customsession/Pods/Headers/Public/MTBlockAlertView/MTBlockAlertView.h
diff --git a/sample-videochat-customsession/Pods/Headers/Public/libextobjc/EXTRuntimeExtensions.h b/sample-videochat-customsession/Pods/Headers/Public/libextobjc/EXTRuntimeExtensions.h
diff --git a/sample-videochat-customsession/Pods/Headers/Public/libextobjc/EXTScope.h b/sample-videochat-customsession/Pods/Headers/Public/libextobjc/EXTScope.h
diff --git a/sample-videochat-customsession/Pods/Headers/Public/libextobjc/metamacros.h b/sample-videochat-customsession/Pods/Headers/Public/libextobjc/metamacros.h
diff --git a/sample-videochat-customsession/Pods/Headers/libextobjc/EXTRuntimeExtensions.h b/sample-videochat-customsession/Pods/Headers/libextobjc/EXTRuntimeExtensions.h
diff --git a/sample-videochat-customsession/Pods/Headers/libextobjc/EXTScope.h b/sample-videochat-customsession/Pods/Headers/libextobjc/EXTScope.h
diff --git a/sample-videochat-customsession/Pods/Headers/libextobjc/metamacros.h b/sample-videochat-customsession/Pods/Headers/libextobjc/metamacros.h
diff --git a/sample-videochat-customsession/Pods/Local Podspecs/Quickblox.podspec b/sample-videochat-customsession/Pods/Local Podspecs/Quickblox.podspec
diff --git a/sample-videochat-customsession/Pods/Manifest.lock b/sample-videochat-customsession/Pods/Manifest.lock
diff --git a/sample-videochat-customsession/Pods/Pods-MTBlockAlertView-Private.xcconfig b/sample-videochat-customsession/Pods/Pods-MTBlockAlertView-Private.xcconfig
diff --git a/sample-videochat-customsession/Pods/Pods-libextobjc-Private.xcconfig b/sample-videochat-customsession/Pods/Pods-libextobjc-Private.xcconfig
diff --git a/sample-videochat-customsession/Pods/Pods.xcconfig b/sample-videochat-customsession/Pods/Pods.xcconfig