Erik 1a5ac74984 Merge branch 'master' into development ...

* master:
  set targetted device family to 3
  use 7.3 image

2016-03-25 17:02:52 -04:00

..

project.xcworkspace

Created project with iOS and Mac targets

2015-07-12 00:58:09 +00:00

xcshareddata/xcschemes

merge master

2016-01-17 08:48:34 -05:00

project.pbxproj

Merge branch 'master' into development

2016-03-25 17:02:52 -04:00