Merge branch 'maint'

[paraslash.git] / ggo / audiod.m4

diff --git a/ggo/audiod.m4 b/ggo/audiod.m4
index 4205c3f53294ac80091864d3d459c29e4207b233..7ff8806ce47d876fab497fd4181f4052629758bd 100644 (file)
--- a/ggo/audiod.m4
+++ b/ggo/audiod.m4
@@ -12,6 +12,7 @@ include(loglevel.m4)
 include(color.m4)
 include(config_file.m4)
 include(logfile.m4)
+include(log_timing.m4)
 include(daemon.m4)
 include(user.m4)
 include(group.m4)
@@ -163,7 +164,7 @@ dependon="no_default_filters"
 details="
        This option may be given multiple times. The \"filter_spec\"
        consists of an audio format, the name of the filter, and any
-       options for that filter. Mote that order matters.
+       options for that filter. Note that order matters.
 
        Examples: