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
..
xcshareddata	Syntax updated.	2015-09-10 10:26:52 +01:00
xcuserdata/nataliaterlecka.xcuserdatad	Merge branch 'zoom' of github.com:imaginary-cloud/CameraManager into zoom	2016-01-26 10:07:54 +00:00
contents.xcworkspacedata	Initial commit.	2014-10-13 10:07:55 +01:00