Merge branch 'release/1.2.1'

bluecadet · Nov 3, 2016 · f96912e · f96912e
2 parents 6ff00a7 + f1a67da
commit f96912e
Show file tree

Hide file tree

Showing 115 changed files with 59 additions and 17,556 deletions.
diff --git a/.gitignore b/.gitignore
@@ -18,7 +18,7 @@
 # Xcode (https://github.com/github/gitignore/blob/master/Global/Xcode.gitignore)
 
 ## Build generated
-build/
+**/xcode/build/
 DerivedData/
 
 ## Various settings

diff --git a/README.md b/README.md
@@ -96,5 +96,5 @@ CINDER_APP(BaseAppSampleApp, RendererGl(RendererGl::Options().msaa(4)), BaseAppS
 
 ## Notes
 
-Version 1.2.0
+Version 1.2.1
 Based on Cinder commit [0b24d643e3b19a4ae6875b92899bae9376f7a64a](https://github.com/cinder/Cinder/commit/0b24d643e3b19a4ae6875b92899bae9376f7a64a)
diff --git a/...deproj/project.xcworkspace/xcuserdata/benbojko.xcuserdatad/UserInterfaceState.xcuserstate b/...deproj/project.xcworkspace/xcuserdata/benbojko.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/...codeproj/project.xcworkspace/xcuserdata/benbojko.xcuserdatad/WorkspaceSettings.xcsettings b/...codeproj/project.xcworkspace/xcuserdata/benbojko.xcuserdatad/WorkspaceSettings.xcsettings
diff --git a/...ssPlatform.xcodeproj/xcuserdata/benbojko.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/...ssPlatform.xcodeproj/xcuserdata/benbojko.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
diff --git a/...latform.xcodeproj/xcuserdata/benbojko.xcuserdatad/xcschemes/BaseAppCrossPlatform.xcscheme b/...latform.xcodeproj/xcuserdata/benbojko.xcuserdatad/xcschemes/BaseAppCrossPlatform.xcscheme
diff --git a/...rossPlatform.xcodeproj/xcuserdata/benbojko.xcuserdatad/xcschemes/xcschememanagement.plist b/...rossPlatform.xcodeproj/xcuserdata/benbojko.xcuserdatad/xcschemes/xcschememanagement.plist
diff --git a/...bug/BaseAppCrossPlatform.build/BaseAppCrossPlatform-all-non-framework-target-headers.hmap b/...bug/BaseAppCrossPlatform.build/BaseAppCrossPlatform-all-non-framework-target-headers.hmap
diff --git a/...tform.build/Debug/BaseAppCrossPlatform.build/BaseAppCrossPlatform-all-target-headers.hmap b/...tform.build/Debug/BaseAppCrossPlatform.build/BaseAppCrossPlatform-all-target-headers.hmap
diff --git a/...Platform.build/Debug/BaseAppCrossPlatform.build/BaseAppCrossPlatform-generated-files.hmap b/...Platform.build/Debug/BaseAppCrossPlatform.build/BaseAppCrossPlatform-generated-files.hmap
diff --git a/...tform.build/Debug/BaseAppCrossPlatform.build/BaseAppCrossPlatform-own-target-headers.hmap b/...tform.build/Debug/BaseAppCrossPlatform.build/BaseAppCrossPlatform-own-target-headers.hmap
diff --git a/...Platform.build/Debug/BaseAppCrossPlatform.build/BaseAppCrossPlatform-project-headers.hmap b/...Platform.build/Debug/BaseAppCrossPlatform.build/BaseAppCrossPlatform-project-headers.hmap
diff --git a/...ild/BaseAppCrossPlatform.build/Debug/BaseAppCrossPlatform.build/BaseAppCrossPlatform.hmap b/...ild/BaseAppCrossPlatform.build/Debug/BaseAppCrossPlatform.build/BaseAppCrossPlatform.hmap