dany/luasocket
1
0
Fork 0
mirror of https://github.com/lunarmodules/luasocket.git synced 2024-07-01 10:59:46 +02:00
Code Issues Packages Projects Releases Wiki Activity
724 Commits 5 Branches 4 Tags 3.1 MiB
4e363330a3
Commit Graph

7 Commits

Author SHA1 Message Date
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
Diego Nehab
d1a72435d5 New release. 2007-10-13 23:55:20 +00:00
cvs2git convertor
81ebe649f0 This commit was manufactured by cvs2svn to create tag 'luasocket-2-0-2'. 
Sprout from master 2007-10-11 21:16:28 UTC Diego Nehab <diego@tecgraf.puc-rio.br> 'Tested each sample.'
Cherrypick from master 2007-05-31 22:27:40 UTC Diego Nehab <diego@tecgraf.puc-rio.br> 'Before sending to Roberto.':
    gem/ltn012.tex
    gem/makefile
 2007-10-11 21:16:29 +00:00
Diego Nehab
52ac60af81 Tested each sample. 2007-10-11 21:16:28 +00:00
Diego Nehab
6d23f14aeb Waiting for Roberto's remarks. 2007-06-15 06:29:07 +00:00
Diego Nehab
3074a8f56b Before sending to Roberto. 2007-05-31 22:27:40 +00:00
Diego Nehab
7b195164b0 Lua Gem. 2007-05-31 21:23:42 +00:00