Tags: wuchuguang/Alamofire
Tags
Merge pull request Alamofire#254 from mowens/bug/handle-0-bytes Added hanlding of valid NSData object with 0 bytes for serializers
Xcode 6.1 Squashed commit of the following: commit 6b6facc Author: Mattt Thompson <[email protected]> Date: Fri Oct 10 05:30:58 2014 -0700 [Issue Alamofire#164] Fixed mistake in merge commit 8a814ee Merge: 0930f42 29d8b97 Author: Mattt Thompson <[email protected]> Date: Thu Oct 9 16:01:55 2014 -0700 Merge branch 'xcode-6.1' of github.com:Alamofire/Alamofire into xcode-6.1 Conflicts: Example/DetailViewController.swift Example/MasterViewController.swift Source/Alamofire.swift Tests/ParameterEncodingTests.swift commit 0930f42 Merge: b1882a1 7362404 Author: Mattt Thompson <[email protected]> Date: Thu Oct 9 15:58:36 2014 -0700 Merge branch 'master' into xcode-6.1 Conflicts: Source/Alamofire.swift commit 29d8b97 Merge: 80cc057 18f1d57 Author: Mattt Thompson <[email protected]> Date: Sun Oct 5 09:17:17 2014 -0700 Merge pull request Alamofire#143 from nduplessis/xcode-6.1 Xcode 6.1 GM fixes commit 18f1d57 Author: Nico du Plessis <[email protected]> Date: Thu Oct 2 13:13:24 2014 +0200 Xcode 6.1 GM fixes commit 80cc057 Merge: 38e0783 f8bb0b4 Author: Mattt Thompson <[email protected]> Date: Tue Sep 30 09:35:22 2014 -0700 Merge pull request Alamofire#139 from orta/xcode-6.1 @mattt => update to support Xcode 6.1b3 commit f8bb0b4 Author: Orta Therox <[email protected]> Date: Tue Sep 30 17:17:27 2014 +0100 update to support Xcode 6.1b3 commit b1882a1 Merge: 34ee306 bc6a58d Author: Mattt Thompson <[email protected]> Date: Thu Sep 25 22:17:50 2014 -0700 Merge branch 'master' into xcode-6.1 Conflicts: Source/Alamofire.swift Tests/ParameterEncodingTests.swift commit 38e0783 Merge: 34ee306 9933340 Author: Mattt Thompson <[email protected]> Date: Fri Sep 19 12:02:23 2014 -0700 Merge pull request Alamofire#114 from rosskimes/xcode-6.1 Compiles on Xcode 6.1 Beta 2. commit 9933340 Author: Ross Kimes <[email protected]> Date: Fri Sep 19 13:17:02 2014 -0500 Compiles on Xcode 6.1 Beta 2. commit 34ee306 Merge: 67ee13a 6c087a9 Author: Mattt Thompson <[email protected]> Date: Thu Sep 18 07:49:27 2014 -0700 Merge branch 'aral-patch-2' into xcode-6.1 commit 6c087a9 Merge: 2abe348 d49bbed Author: Mattt Thompson <[email protected]> Date: Thu Sep 18 07:49:15 2014 -0700 Merge branch 'patch-2' of github.com:aral/Alamofire into aral-patch-2 commit 67ee13a Merge: 2abe348 ab4f4c0 Author: Mattt Thompson <[email protected]> Date: Thu Sep 18 07:48:31 2014 -0700 Merge branch 'patch-1' of github.com:aral/Alamofire into aral-patch-1 Conflicts: Source/Alamofire.swift commit d49bbed Author: Aral Balkan <[email protected]> Date: Wed Sep 17 00:33:10 2014 +0100 Replaced toRaw with rawValue (Xcode 6.1 Beta 2 update) commit ab4f4c0 Author: Aral Balkan <[email protected]> Date: Wed Sep 17 00:31:15 2014 +0100 Updated fromRaw and toRaw to rawValue Fixed for Xcode 6.1 Beta 2.