Merge more Core Audio hackery from uaudio branch.

[disorder] / debian / conffiles.disorder-server

diff --git a/debian/conffiles.disorder-server b/debian/conffiles.disorder-server
index 41df91db5fc7c5a4b17b7175cbf996b6b79b20dd..5d44ee4b2f1c2291e5eb21c97239a28c3c7fa9d3 100644 (file)
--- a/debian/conffiles.disorder-server
+++ b/debian/conffiles.disorder-server
@@ -1,3 +1,4 @@
 /etc/disorder/config
 /etc/disorder/options
+/etc/disorder/options.user
 /etc/init.d/disorder