Merge commit 'scormi3/master'

author Thadeu Lima de Souza Cascardo <cascardo@minaslivre.org>

Mon, 10 Mar 2008 12:38:45 +0000 (09:38 -0300)

committer Thadeu Lima de Souza Cascardo <cascardo@minaslivre.org>

Mon, 10 Mar 2008 12:38:45 +0000 (09:38 -0300)
author Thadeu Lima de Souza Cascardo <cascardo@minaslivre.org>
Mon, 10 Mar 2008 12:38:45 +0000 (09:38 -0300)
committer Thadeu Lima de Souza Cascardo <cascardo@minaslivre.org>
Mon, 10 Mar 2008 12:38:45 +0000 (09:38 -0300)
diff --cc gnio/gsocket.c
Simple merge
diff --cc gnio/gsocket.h
Simple merge
diff --cc gnio/gtcpclient.c
Simple merge
diff --cc test/test-server.c
Simple merge
author	Thadeu Lima de Souza Cascardo <cascardo@minaslivre.org>
	Mon, 10 Mar 2008 12:38:45 +0000 (09:38 -0300)
committer	Thadeu Lima de Souza Cascardo <cascardo@minaslivre.org>
	Mon, 10 Mar 2008 12:38:45 +0000 (09:38 -0300)
		1	2
gnio/gsocket.c	patch \|	diff1 \|	diff2 \|	blob \| history
gnio/gsocket.h	patch \|	diff1 \|	diff2 \|	blob \| history
gnio/gtcpclient.c	patch \|	diff1 \|	diff2 \|	blob \| history
test/test-server.c	patch \|	diff1 \|	diff2 \|	blob \| history