merge master

This commit is contained in:
Erik 2015-04-07 21:56:36 -04:00
commit d8ea3a3c11
2 changed files with 47 additions and 47 deletions

View File

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