Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merging

  • Loading branch information...
commit 9ab4c9870e7101ae8ecbafce93a66d7361a7fec7 1 parent b5aedd6
@samus samus authored
View
1  ios/Camp Joy Outdoors.xcodeproj/project.pbxproj
@@ -311,6 +311,7 @@
isa = PBXGroup;
children = (
09939F4118132B300043AFCD /* glossary */,
+ 4290D7EF1813293E00B8057A /* dichotomy */,
FA4638B418131C2A007F62DD /* maps */,
FA0B2BDE1812F22800FF21A7 /* trees */,
4252C39B180F8888001F86F5 /* Camp Joy Outdoors-Info.plist */,
View
2  ios/Camp Joy Outdoors/Base.lproj/Main_iPhone.storyboard
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="4510" systemVersion="12F45" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="8YX-ce-x5E">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="4510" systemVersion="12E55" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="8YX-ce-x5E">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3742"/>
</dependencies>
Please sign in to comment.
Something went wrong with that request. Please try again.