Skip to content

Commit

Permalink
Merge pull request #1 from BurntCaramel/Swift2
Browse files Browse the repository at this point in the history
Swift 2
  • Loading branch information
RoyalIcing committed Sep 22, 2015
2 parents aed7ab8 + 31f1ae2 commit 4b842b7
Show file tree
Hide file tree
Showing 58 changed files with 679 additions and 360 deletions.
8 changes: 4 additions & 4 deletions Cartfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
github "Alamofire/Alamofire" >= 1.3
github "Alamofire/Alamofire" >= 2.0
github "mattt/Ono" >= 1.2.2
github "burntcaramel/BurntFoundation" >= 0.1
github "burntcaramel/BurntCocoaUI" >= 0.2
github "burntcaramel/BurntList" >= 0.2
github "burntcaramel/BurntFoundation" >= 0.2
github "burntcaramel/BurntCocoaUI" >= 0.3
github "burntcaramel/BurntList" >= 0.3
8 changes: 4 additions & 4 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
github "Alamofire/Alamofire" "1.3.1"
github "burntcaramel/BurntCocoaUI" "0.2.2"
github "burntcaramel/BurntFoundation" "0.1.5"
github "burntcaramel/BurntList" "0.2.2"
github "Alamofire/Alamofire" "2.0.2"
github "burntcaramel/BurntCocoaUI" "0.3.0"
github "burntcaramel/BurntFoundation" "0.2.0"
github "burntcaramel/BurntList" "0.3.0"
github "mattt/Ono" "1.2.2"
Binary file modified Carthage/Build/Mac/Alamofire.framework/Versions/A/Alamofire
Binary file not shown.

Large diffs are not rendered by default.

Binary file not shown.
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified Carthage/Build/Mac/BurntList.framework/Versions/A/BurntList
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 4b842b7

Please sign in to comment.