From: Andre Noll <maan@tuebingen.mpg.de>
Date: Sun, 17 Aug 2014 11:17:23 +0000 (+0200)
Subject: Merge branch 't/daemon_cleanups'
X-Git-Tag: v0.5.4~60
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=c1b282afb8e8422d12ae01a77937f27281748f1b

Merge branch 't/daemon_cleanups'

Cooking for two months.

	* daemon: Rename public functions.
	* Simplify set_server_start_time().

Conflicts:
	server.c
---

c1b282afb8e8422d12ae01a77937f27281748f1b
diff --cc NEWS
index 40ab08a1,642c1fc4..e179240b
--- a/NEWS
+++ b/NEWS
@@@ -1,15 -1,11 +1,23 @@@
  NEWS
  ====
  
 --------------------------------------------------
 -0.5.3 (to be released) "symbolic synchronization"
 --------------------------------------------------
++-----------------------------------------------
++0.5.4 (to be announced) "exponential alignment"
++-----------------------------------------------
+ 
++	* Minor cleanups to daemon.c.
++
++Download: ./releases/paraslash-git.tar.bz2
++
 +---------------------------------------------
 +0.5.3 (2014-08-01) "symbolic synchronization"
 +---------------------------------------------
 +
 +Not many new features, but lots of fixes and usability improvements.
 +
 +	- para_gui has been converted to use the paraslash scheduler.
  	- Various alsa-related fixes, mostly for the raspberry pi.
 +	- Many scheduler improvements and cleanups.
  	- The test suite has been extended to include sanity checks
  	  for the generated man pages.
  	- ao_writer fixes. This writer was in a quite bad shape. Many