Skip to content

Commit 90e41cf

Browse files
committed
Merge branch 'swift3'
2 parents e067414 + b3b8f8a commit 90e41cf

File tree

26 files changed

+653
-889
lines changed

26 files changed

+653
-889
lines changed

.swift-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3.0

Cartfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
github "nakiostudio/EasyPeasy"

Cartfile.private

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
github "devxoul/Then"

Cartfile.resolved

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
github "nakiostudio/EasyPeasy" "a79e0d1c48d42cc1a28ea95e9fd8b924dfbea8a8"
2+
github "devxoul/Then" "2.0.0"

Example/Podfile

Lines changed: 0 additions & 12 deletions
This file was deleted.

Example/Podfile.lock

Lines changed: 0 additions & 22 deletions
This file was deleted.

Example/StackScrollView.xcodeproj/project.pbxproj

Lines changed: 0 additions & 580 deletions
This file was deleted.

Example/StackScrollView.xcodeproj/xcshareddata/xcschemes/StackScrollView-Example.xcscheme

Lines changed: 0 additions & 115 deletions
This file was deleted.

Example/StackScrollView.xcworkspace/contents.xcworkspacedata

Lines changed: 0 additions & 10 deletions
This file was deleted.

Example/StackScrollView/Base.lproj/LaunchScreen.xib

Lines changed: 0 additions & 41 deletions
This file was deleted.

0 commit comments

Comments
 (0)