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

Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1

Browse source 
Conflicts:
	NEWS
	README
	configure.in
	src/Makefile.am
	src/conf.c
	src/conf.h
	src/connection.c
	src/net.c
	src/tincd.c
This commit is contained in:
Guus Sliepen 2012-03-25 23:35:31 +01:00
commit 86c2990327
31 changed files with 464 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

2
README
View file

@ -1,7 +1,7 @@
This is the README file for tinc version 1.1pre2. Installation
instructions may be found in the INSTALL file.
tinc is Copyright (C) 1998-2011 by:
tinc is Copyright (C) 1998-2012 by:
Ivo Timmermans,
Guus Sliepen <guus@tinc-vpn.org>,