Mercurial > prosody-hg
diff net/server_select.lua @ 2925:692b3c6c5bd2
Merge 0.6->0.7
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 22 Mar 2010 17:24:55 +0000 |
| parents | net/server.lua@b7049746bd29 net/server.lua@2442c54cf9ec |
| children | fdd049a4e551 |
line wrap: on
line diff
--- a/net/server_select.lua Mon Mar 22 15:05:05 2010 +0000 +++ b/net/server_select.lua Mon Mar 22 17:24:55 2010 +0000 @@ -2,7 +2,7 @@ -- server.lua by blastbeat of the luadch project -- Re-used here under the MIT/X Consortium License -- --- Modifications (C) 2008-2009 Matthew Wild, Waqas Hussain +-- Modifications (C) 2008-2010 Matthew Wild, Waqas Hussain -- -- // wrapping luadch stuff // --
