Erik 395dc48287 Merge branch 'master' into travis ... * master: bump version try and fix carthage builds bump version:		2015-10-15 14:09:46 -04:00
..
project.xcworkspace	Created project with iOS and Mac targets	2015-07-12 00:58:09 +00:00
xcshareddata/xcschemes	remove tv, check tv branch	2015-09-25 11:31:54 -04:00
project.pbxproj	Merge branch 'master' into travis	2015-10-15 14:09:46 -04:00