Guus Sliepen
|
075e6828a7
|
Merge branch 'master' into 1.1
Conflicts:
have.h
lib/dropin.c
lib/fake-getaddrinfo.c
lib/pidfile.c
src/Makefile.am
src/bsd/device.c
src/conf.c
src/connection.c
src/connection.h
src/graph.c
src/mingw/device.c
src/net.c
src/net_setup.c
src/node.c
src/protocol_key.c
src/protocol_misc.c
src/tincd.c
|
2009-09-16 19:55:47 +02:00 |
|
Guus Sliepen
|
81afa26e4a
|
Convert bitfields to integers in a safe way.
This is commit eb391c52ee redone, but without the
non-standard anonymous union.
|
2009-09-09 12:04:08 +02:00 |
|
Guus Sliepen
|
5a132550de
|
Merge branch 'master' into 1.1
Conflicts:
doc/tincd.8.in
lib/pidfile.c
src/graph.c
src/net.c
src/net.h
src/net_packet.c
src/net_setup.c
src/net_socket.c
src/netutl.c
src/node.c
src/node.h
src/protocol_auth.c
src/protocol_key.c
src/tincd.c
|
2009-06-05 23:14:13 +02:00 |
|
Guus Sliepen
|
a5fb0d8c6c
|
Add some const where appropriate.
|
2009-05-28 23:18:22 +02:00 |
|
Guus Sliepen
|
f02d3ed3e1
|
K&R style braces
|
2007-05-18 10:00:00 +00:00 |
|
Guus Sliepen
|
de78d79db8
|
Update copyright notices, remove Ivo's email address.
|
2006-04-26 13:52:58 +00:00 |
|
Guus Sliepen
|
df3220a154
|
Update copyright notices.
|
2005-05-04 18:09:30 +00:00 |
|
Guus Sliepen
|
7926a156e5
|
Update copyrights, links, email addresses and let Subversion update $Id$ keywords.
|
2004-03-21 14:21:22 +00:00 |
|
Guus Sliepen
|
013a2e159e
|
Synchronise HEAD with CABAL branch.
|
2003-08-24 20:38:31 +00:00 |
|
Ivo Timmermans
|
462ab530e5
|
Updating HEAD branch #4; Merging CABAL -> HEAD.
|
2002-04-09 15:26:01 +00:00 |
|
Ivo Timmermans
|
30df5e95db
|
Bring head revision up to date with cabal (try #3)
|
2000-10-18 20:12:10 +00:00 |
|
Ivo Timmermans
|
1243156a5e
|
Initial revision
|
2000-03-26 00:33:07 +00:00 |
|