Rainer Gerhards a5b4cb1681 Merge branch 'beta' ...

Conflicts:
	ChangeLog
	tcpsrv.c
	tcpsrv.h

Note: we have a slight inconsistency, as interface version v4 was already
used for tcpsrv in this branch. We accept this inconsistency.

2009-04-09 13:44:52 +02:00

..

imtcp.c

Merge branch 'beta'

2009-04-09 13:44:52 +02:00

Makefile.am

make all cflags and libs variables uppercase

2009-02-24 13:09:44 +01:00