From: Andre Noll <maan@tuebingen.mpg.de>
Date: Sun, 13 Dec 2015 11:21:44 +0000 (+0100)
Subject: Merge branch 'refs/heads/t/priority'
X-Git-Tag: v0.5.6~84
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=74322f0fab30777d8e34486fce1d81d4bc1106a0;p=paraslash.git

Merge branch 'refs/heads/t/priority'

A single commit which was cooking in next for two months.

* refs/heads/t/priority:
  daemon: New option --priority for server and audiod.
---

74322f0fab30777d8e34486fce1d81d4bc1106a0
diff --cc NEWS
index 7faa0ddd,f1940d3d..a5bef9f6
--- a/NEWS
+++ b/NEWS
@@@ -7,11 -7,6 +7,12 @@@ current master branch "cascading gradie
  
  	- para_afh learned to modify meta tags of mp3 wma ogg spx
  	  opus flac aac files.
 +	- afs commands propagate error codes to the client.
 +	- The check command now also checks the attribute table for
 +	  inconsistencies.
 +	- New -v flag for the version command (print verbose version string)
++	- New option --priority for para_server and para_audiod.
 +
  
  --------------------------------------
  0.5.5 (2015-09-20) "magnetic momentum"