Merge commit 'scormi3/master'
authorThadeu Lima de Souza Cascardo <cascardo@minaslivre.org>
Mon, 10 Mar 2008 12:38:45 +0000 (09:38 -0300)
committerThadeu Lima de Souza Cascardo <cascardo@minaslivre.org>
Mon, 10 Mar 2008 12:38:45 +0000 (09:38 -0300)
commit932359e12259081300067d273febe261eee0c870
tree92c6c00daca9f266fe9edd61b1e44468cd1bc441
parent5183a9b80c8a22531948af76f4433f0a1a510cbc
parent698f0efbb5a9ef8f502f688808a52888c1e1cee6
Merge commit 'scormi3/master'

Conflicts:

gnio/gsocket.c
gnio/gsocket.h
gnio/gsocket.c
gnio/gsocket.h
gnio/gtcpclient.c
test/test-server.c