Software / code / prosody
Changeset
6315:7a3e2f2d43fc
Merge 0.9->0.10
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 25 Jul 2014 13:54:27 +0100 |
| parents | 6312:1940a014aeca (current diff) 6314:8029b8a5f37a (diff) |
| children | 6316:e144a1b67c30 6319:92d009af6eba |
| files | net/server_event.lua net/server_select.lua |
| diffstat | 2 files changed, 2 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff