From 8ebf464e20ffe6851931c00a6c213b07baa88509 Mon Sep 17 00:00:00 2001 From: Ryan Romanchuk Date: Sun, 15 Mar 2015 13:07:31 -0700 Subject: [PATCH 1/2] Water from remote heads --- Alamofire | 2 +- SwiftyJSON | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Alamofire b/Alamofire index b5d6f58..90c4d77 160000 --- a/Alamofire +++ b/Alamofire @@ -1 +1 @@ -Subproject commit b5d6f581a8a01cb0e985f580dc36d87581f40d9b +Subproject commit 90c4d77be8af79fba58f276bc8f6bbc30e35c8d3 diff --git a/SwiftyJSON b/SwiftyJSON index 25ceb60..52e916b 160000 --- a/SwiftyJSON +++ b/SwiftyJSON @@ -1 +1 @@ -Subproject commit 25ceb607a457aad56e679e687d271c837a7c9e8b +Subproject commit 52e916b7a76484cb6e1efc05f304599fe6c2de7b From 6d2d481be1bb60629355f6a0e8f859100de696d3 Mon Sep 17 00:00:00 2001 From: Ryan Romanchuk Date: Sun, 15 Mar 2015 13:46:41 -0700 Subject: [PATCH 2/2] Shere scheme for carthage support --- .../xcschemes/AlamofireSwiftyJSON.xcscheme | 110 ++++++++++++++++++ 1 file changed, 110 insertions(+) create mode 100644 Alamofire-SwiftyJSON.xcodeproj/xcshareddata/xcschemes/AlamofireSwiftyJSON.xcscheme diff --git a/Alamofire-SwiftyJSON.xcodeproj/xcshareddata/xcschemes/AlamofireSwiftyJSON.xcscheme b/Alamofire-SwiftyJSON.xcodeproj/xcshareddata/xcschemes/AlamofireSwiftyJSON.xcscheme new file mode 100644 index 0000000..74e3960 --- /dev/null +++ b/Alamofire-SwiftyJSON.xcodeproj/xcshareddata/xcschemes/AlamofireSwiftyJSON.xcscheme @@ -0,0 +1,110 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +