diff options
| author | Tanu Kaskinen <tanuk@iki.fi> | 2009-10-02 17:24:44 +0300 |
|---|---|---|
| committer | Tanu Kaskinen <tanuk@iki.fi> | 2009-10-02 17:24:44 +0300 |
| commit | 019331d25b6af107fb8cacc3ada552e7567a64bf (patch) | |
| tree | d5545e795e164fb6cd8edae1a45e7b8bb966ee12 /src/daemon/daemon-conf.c | |
| parent | 587131917f9129c8347c789febb7e755dfb091de (diff) | |
| parent | afd1b6d355ef1a41cb3592485855e273a5de69c1 (diff) | |
Merge branch 'master' into dbus-work
Conflicts:
src/daemon/daemon-conf.c
Diffstat (limited to 'src/daemon/daemon-conf.c')
| -rw-r--r-- | src/daemon/daemon-conf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/daemon/daemon-conf.c b/src/daemon/daemon-conf.c index 3428f807..571faae4 100644 --- a/src/daemon/daemon-conf.c +++ b/src/daemon/daemon-conf.c @@ -86,7 +86,7 @@ static const pa_daemon_conf default_conf = { #ifdef HAVE_DBUS .local_server_type = PA_SERVER_TYPE_UNSET, /* The actual default is _USER, but we have to detect when the user doesn't specify this option. */ #endif - .no_cpu_limit = FALSE, + .no_cpu_limit = TRUE, .disable_shm = FALSE, .lock_memory = FALSE, .default_n_fragments = 4, |