From: Guus Sliepen Date: Fri, 24 Jun 2011 19:40:55 +0000 (+0200) Subject: Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1 X-Git-Tag: release-1.1pre1~7 X-Git-Url: https://tinc-vpn.org/git/browse?a=commitdiff_plain;h=79e9a4f743b7b59fed968575f6b36171cf4a0063;p=tinc Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1 Conflicts: NEWS README configure.in src/Makefile.am --- 79e9a4f743b7b59fed968575f6b36171cf4a0063 diff --cc NEWS index 1a121551,20a98d8a..44366cda --- a/NEWS +++ b/NEWS @@@ -1,10 -1,10 +1,16 @@@ +Version 1.1-cvs Work in progress + + * Use libevent to handle I/O events and timeouts. + + * Use splay trees instead of AVL trees. + - * Fix ProcessPriority option under Windows. + Version 1.0.15 June 24 2011 + + * Improved logging to file. + + * Reduced amount of process wakeups on platforms which support pselect(). + + * Fixed ProcessPriority option under Windows. Version 1.0.14 May 8 2011 diff --cc src/Makefile.am index d9bf293f,ff011f8c..60709fb7 --- a/src/Makefile.am +++ b/src/Makefile.am @@@ -40,7 -27,10 +40,7 @@@ if TUNEM LIBS += -lpcap endif - AM_CFLAGS = @CFLAGS@ -DCONFDIR=\"$(sysconfdir)\" -DLOCALSTATEDIR=\"$(localstatedir)\" -DSBINDIR=\"$(sbindir)\" -tincd_LDADD = \ - $(top_builddir)/lib/libvpn.a - -AM_CFLAGS = -DCONFDIR=\"$(sysconfdir)\" -DLOCALSTATEDIR=\"$(localstatedir)\" ++AM_CFLAGS = -DCONFDIR=\"$(sysconfdir)\" -DLOCALSTATEDIR=\"$(localstatedir)\" -DSBINDIR=\"$(sbindir)\" dist-hook: rm -f `find . -type l`