Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1
authorGuus Sliepen <guus@tinc-vpn.org>
Fri, 24 Jun 2011 19:40:55 +0000 (21:40 +0200)
committerGuus Sliepen <guus@tinc-vpn.org>
Fri, 24 Jun 2011 19:40:55 +0000 (21:40 +0200)
Conflicts:
NEWS
README
configure.in
src/Makefile.am

1  2 
NEWS
README.git
src/Makefile.am

diff --cc NEWS
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,10 -1,10 +1,16 @@@
-  * Fix ProcessPriority option under Windows.
 +Version 1.1-cvs              Work in progress
 +
 + * Use libevent to handle I/O events and timeouts.
 +
 + * Use splay trees instead of AVL trees.
 +
+ 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 README.git
Simple merge
diff --cc 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`