]> git.ipfire.org Git - thirdparty/tornado.git/commitdiff
projects / thirdparty / tornado.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a6740e3 a5b2d4a)
Merge remote-tracking branch 'jordanbettis/feature-waitany' into wait-any
authorBen Darnell <ben@bendarnell.com>
Sun, 18 Jan 2015 21:28:46 +0000 (16:28 -0500)
committerBen Darnell <ben@bendarnell.com>
Sun, 18 Jan 2015 21:28:46 +0000 (16:28 -0500)
1  2 
tornado/gen.py patch | diff1 | diff2 | blob | history
tornado/test/gen_test.py patch | diff1 | diff2 | blob | history

diff --cc tornado/gen.py
Simple merge
diff --cc tornado/test/gen_test.py
Simple merge
Mirror of https://github.com/tornadoweb/tornado.git