Merge branch 'master' into engineerrors

This commit is contained in:
Erik 2015-04-07 21:54:59 -04:00
commit be5764ce59

View File

@ -24,7 +24,7 @@
import Foundation import Foundation
public typealias AckCallback = (NSArray?) -> Void public typealias AckCallback = @objc_block (NSArray?) -> Void
public typealias OnAckCallback = (timeout:UInt64, callback:AckCallback) -> Void public typealias OnAckCallback = (timeout:UInt64, callback:AckCallback) -> Void
struct SocketAckMap { struct SocketAckMap {