j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Merge branch 'master' into 1.1

Browse source 
Conflicts:
	lib/utils.c
	src/net_setup.c
	src/process.c
	src/protocol_auth.c
	src/protocol_key.c
	src/utils.h
This commit is contained in:
Guus Sliepen 2012-09-30 15:00:47 +02:00
commit 6dfdb32361
9 changed files with 69 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
THANKS
View file

@ -28,6 +28,7 @@ We would like to thank the following people for their contributions to tinc:
* Mark Glines
* Markus Goetz
* Martin Kihlgren
* Martin Schürrer
* Matias Carrasco
* Max Rijevski
* Menno Smits
@ -45,6 +46,7 @@ We would like to thank the following people for their contributions to tinc:
* Teemu Kiviniemi
* Timothy Redaelli
* Tonnerre Lombard
* Vil Brekin
* Wessel Dankers
* Wouter van Heyst