CameraManager/camera.xcodeproj
Ricardo Torrão 93c9920a65 Merge branch 'zoom' of github.com:imaginary-cloud/CameraManager into zoom
# Conflicts:
#	camera.xcodeproj/project.xcworkspace/xcuserdata/nataliaterlecka.xcuserdatad/UserInterfaceState.xcuserstate
#	camera/CameraManager.swift
2016-01-26 10:07:54 +00:00
..
project.xcworkspace Merge branch 'zoom' of github.com:imaginary-cloud/CameraManager into zoom 2016-01-26 10:07:54 +00:00
xcshareddata/xcschemes Syntax updated for Swift 2.0 2015-07-30 14:04:15 +01:00
xcuserdata/nataliaterlecka.xcuserdatad Syntax updated for Swift 2.0 2015-07-30 14:04:15 +01:00
project.pbxproj Syntax updated for Swift 2.0 2015-07-30 14:04:15 +01:00