Software / code / prosody
Changeset
6316:e144a1b67c30
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 25 Jul 2014 13:54:47 +0100 |
| parents | 6313:8bd486b6e5ec (current diff) 6315:7a3e2f2d43fc (diff) |
| children | 6317:ec57067c1e0d |
| files | net/server_event.lua net/server_select.lua |
| diffstat | 2 files changed, 2 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff