Merge branch 'maint'

Conflicts:
	configure.ac

diff --git a/configure.ac b/configure.ac
index f47a56df0c96f71d68e19b3655aa017925536a83..efde761f4f186459e05c1aec158319d4e2816068 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -735,7 +735,6 @@ AC_DEFINE_UNQUOTED(STATUS_ITEM_ARRAY, [$result],
 AC_DEFINE_UNQUOTED(SERVER_AUDIO_FORMATS, "$server_audio_formats",
        [formats supported by para_server and para_afh])
 
-
 AC_SUBST(executables, add_para($executables))
 
 recv_objs="$recv_cmdline_objs $recv_errlist_objs"