From: Andre Noll <maan@systemlinux.org>
Date: Sat, 22 Feb 2014 16:29:10 +0000 (+0100)
Subject: Merge branch 't/sync'
X-Git-Tag: v0.5.2~11
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=d87806284b9f6be9aab71ccbf0280d273b57eeb3

Merge branch 't/sync'

Cooking since 2014-01-14.

	* t/sync:
	  The sync filter.
	  net: Let maksock() callers perform flowopt cleanup.
	  net: makesock_addrinfo(): Make socketfd local to the loop.
	  net: Let makesock() continue on setsockopt() failure.
	  net: Reduce indentation level in makesock_addrinfo().
	  net: Further simplify makesock_addrinfo().
	  net: Replace the double loop of lookup_address() by a single loop.
	  net: makesock(): Combine code for passive sockets.
	  net: Change makesock_addrinfo() to set given flowopts before SO_REUSEADDR.
	  net: Clarify code flow of makesock_addrinfo().
	  net: Remove unnecessary condition in makesock_addrinfo().
	  net: Remove pointless initialization in makesock_addrinfo().
	  net: Kill dead code in makesock_addrinfo().
	  net: Remove networking headers from para.h.
	  net: Improve error handling of makesock_addrinfo().
	  net: Split makesock(), part 2: Introduce makesock_addrinfo().
	  net: Split makesock(), part 1: Introduce lookup_address().
	  net: Simplify makesock().
	  net: Fix parse_url().
	  net: Correct \return text of parse_url().
---

d87806284b9f6be9aab71ccbf0280d273b57eeb3
diff --cc NEWS
index c3cf479a,51d9db7c..cc9b67ad
--- a/NEWS
+++ b/NEWS
@@@ -1,12 -1,6 +1,14 @@@
  NEWS
  ====
  
- ---------------------------------
- 0.5.2 (???) "orthogonal interior"
- ---------------------------------
++---------------------------------------------
++0.5.2 (to be announced) "orthogonal interior"
++---------------------------------------------
 +
++	- The new sync synchronizes playback between multiple clients.
++	- Major cleanup of the networking subsystem.
 +	- Minor fixes to avoid clang warnings.
 +
  ------------------------------------------
  0.5.1 (2013-12-20) "temporary implication"
  ------------------------------------------