merge 'lennart' branch back into trunk.

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1971 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2007-10-28 19:13:50 +00:00
parent 6687dd0131
commit a67c21f093
294 changed files with 79057 additions and 11614 deletions

View file

@ -92,10 +92,19 @@
; rlimit-core = -1
; rlimit-data = -1
; rlimit-fsize = -1
; rlimit-nofile = 200
; rlimit-nofile = 256
; rlimit-stack = -1
; rlimit-nproc = -1
; rlimit-memlock = 25
; rlimit-memlock = 16384
## Disable shared memory data transfer
; disable-shm = 0
## Default sample format
; default-sample-format = s16le
; default-sample-rate = 44100
; default-sample-channels = 2
## Default fragment settings, for device drivers that need this
; default-fragments = 4
; default-fragment-size-msec = 25