Merge branch 'master' into dbus-work

Conflicts:
	src/daemon/daemon-conf.c
	src/daemon/daemon-conf.h
	src/daemon/main.c
	src/pulsecore/dbus-util.h
This commit is contained in:
Tanu Kaskinen 2009-06-29 18:35:06 +03:00
commit 0bc538b08c
207 changed files with 33341 additions and 18718 deletions

View file

@ -28,15 +28,16 @@
; local-server-type = user
; disable-shm = no
; shm-size-bytes = 0 # setting this 0 will use the system-default, usually 64 MiB
; lock-memory = no
; no-cpu-limit = no
; high-priority = yes
; nice-level = -11
; realtime-scheduling = no
; realtime-scheduling = yes
; realtime-priority = 5
; exit-idle-time = 20
; module-idle-time = 20
; scache-idle-time = 20
; dl-search-path = (depends on architecture)
@ -56,8 +57,6 @@
; flat-volumes = yes
; no-cpu-limit = no
; rlimit-fsize = -1
; rlimit-data = -1
; rlimit-stack = -1