Sam Roberts 4b671f4551 Merge branch 'git-sam' into diego-sam-mwild-integration ... Conflicts in options.c were just due to independent small functions being close to each other. unix.c in mwild was broken, it wasn't using LUASOCKET_API. serial.c needed luaL_reg renamed, and to use LUASOCKET_API. makefile didn't respect standard DESTDIR and prefix makefile variables, and didn't allow LUAV variable to select lua version to build against. I've tested the top-level install-both target builds and installs against both lua5.1 and lua5.2, but not done further testing. Conflicts: README config gem/ltn012.tex makefile src/makefile src/options.c src/options.h src/tcp.c src/usocket.c		2012-04-11 14:18:20 -07:00
..
dns.html	Fix links to home.html, they should be to index.html.	2012-04-11 13:45:59 -07:00
ftp.html	Fix links to home.html, they should be to index.html.	2012-04-11 13:45:59 -07:00
http.html	Fix links to home.html, they should be to index.html.	2012-04-11 13:45:59 -07:00
index.html	Fix links to home.html, they should be to index.html.	2012-04-11 13:45:59 -07:00
installation.html	Fix links to home.html, they should be to index.html.	2012-04-11 13:45:59 -07:00
introduction.html	Fix links to home.html, they should be to index.html.	2012-04-11 13:45:59 -07:00
ltn12.html	Fix links to home.html, they should be to index.html.	2012-04-11 13:45:59 -07:00
lua05.ppt	Lua Workshop presentation.	2005-11-02 02:53:16 +00:00
luasocket.png	LuaSocket 2.0 User's Manual.	2003-08-31 01:00:15 +00:00
mime.html	Fix links to home.html, they should be to index.html.	2012-04-11 13:45:59 -07:00
reference.css	Fixing bugs...	2004-06-20 22:19:54 +00:00
reference.html	Merge branch 'git-sam' into diego-sam-mwild-integration	2012-04-11 14:18:20 -07:00
smtp.html	Fix links to home.html, they should be to index.html.	2012-04-11 13:45:59 -07:00
socket.html	Merge branch 'git-sam' into diego-sam-mwild-integration	2012-04-11 14:18:20 -07:00
tcp.html	Merge branch 'git-sam' into diego-sam-mwild-integration	2012-04-11 14:18:20 -07:00
udp.html	Fix links to home.html, they should be to index.html.	2012-04-11 13:45:59 -07:00
url.html	Fix links to home.html, they should be to index.html.	2012-04-11 13:45:59 -07:00