Commit Graph

8 Commits

Author SHA1 Message Date
Erik 846f10eb13 Merge branch 'master' into swift-2
* master:
  update readme
  change api for emitack callback
2015-07-23 13:51:50 -04:00
Erik 47a839b934 change api for emitack callback 2015-07-22 19:09:47 -04:00
Erik a277e88c3b update for xcode 7 beta 4 2015-07-21 16:19:15 -04:00
Erik 68078e50d5 the weirdness with objc blocks is fixed in Swift 2 2015-07-10 06:45:58 -04:00
Erik 1c8fcee772 remove comment 2015-06-12 09:23:11 -04:00
Erik 78727dc0ee untested with socket.io, this just compiles 2015-06-08 20:02:59 -04:00
Erik acefc89b0d tweaks 2015-04-14 16:25:08 -04:00
Erik 156562902e rename folder 2015-04-09 19:09:53 -04:00