Software /
code /
prosody
Comparison
net/server.lua @ 138:cb0dd442ca63
Making the best attempt out of a bad merge from waqas
author | Matthew Wild <mwild1@gmail.com> |
---|---|
date | Thu, 23 Oct 2008 18:24:55 +0100 |
parent | 127:93f3c6b94c75 |
child | 319:4a8a949c3870 |
comparison
equal
deleted
inserted
replaced
137:9a05dfb35dd5 | 138:cb0dd442ca63 |
---|---|
825 add = addserver, | 825 add = addserver, |
826 loop = loop, | 826 loop = loop, |
827 stats = stats, | 827 stats = stats, |
828 closeall = closeall, | 828 closeall = closeall, |
829 addtimer = addtimer, | 829 addtimer = addtimer, |
830 | 830 wraptlsclient = wraptlsclient, |
831 } | 831 } |