From: Andre Noll <maan@systemlinux.org>
Date: Sun, 20 Feb 2011 11:44:05 +0000 (+0100)
Subject: Merge branch 'maint'
X-Git-Tag: v0.4.6~41
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=9417eae5ca2b9f10d25f769221e8fd91048bc68a;ds=sidebyside

Merge branch 'maint'

Conflicts:
	configure.ac
---

9417eae5ca2b9f10d25f769221e8fd91048bc68a
diff --cc configure.ac
index f47a56df,f7b70c1c..efde761f
--- a/configure.ac
+++ b/configure.ac
@@@ -732,11 -633,6 +732,10 @@@ don
  AC_DEFINE_UNQUOTED(STATUS_ITEM_ARRAY, [$result],
  	[char * array of all status items])
  
 +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"
  filter_objs="$filter_cmdline_objs $filter_errlist_objs"