14 Commits

Author SHA1 Message Date
Erik
15954f36f5 Merge branch 'master' into 1.2 2015-03-19 08:30:08 -04:00
Erik
fd3dbee71c fixes 2015-03-19 08:23:43 -04:00
Erik
07f2d7465a merge master 2015-03-18 13:11:02 -04:00
Erik
c67e7a3003 work on socketio/socket.io-client-swift#11 2015-03-18 09:19:22 -04:00
Erik
c6d0331d50 merge timeouts fixes for 1.2 2015-03-16 09:06:45 -04:00
Erik
18c25fabdf merge master 2015-03-16 08:55:37 -04:00
Erik
c103734035 work on parsing stuff 2015-03-15 23:41:01 -04:00
Erik
560235353d merge master 2015-03-12 14:49:00 -04:00
Erik
170b1bc836 API CHANGE. See README 2015-02-23 15:08:38 -05:00
Erik
082c00dbb1 backport new stuff from 1.2 branch. Adds acks 2015-02-19 22:52:22 -05:00
Erik
f826ca4b8e Fix weird optimization bug 2015-02-13 18:16:09 -05:00
Erik
6d6ac0fc74 clean up swiftregex 2015-02-11 11:56:14 -05:00
Erik
ca00926647 swift 1.2 2015-02-09 17:06:45 -05:00
Erik
2b66831ca1 move files 2014-11-23 17:05:46 -05:00