add module-combine

remove option "stay-root"
clean up pa_conf


git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@199 fefdeb5f-60dc-0310-8127-8f9354f1896f

1 files changed, 6 insertions, 3 deletions

diff --git a/doc/todo b/doc/todo
index 135a336d..8daabc33 100644
--- a/doc/todo
+++ b/doc/todo
@@ -3,22 +3,25 @@
 *** 0.5 ***
 - make mcalign merge chunks
 - use ref counting in more objects (i.e. sink, source, sink_input, source_output)
-- unix socket directories include user name
 - native library/protocol:
    module load/unload
    kill client/...
    autoload management
    rename streams/contexts
 - more complete pactl
-- add sample directory
 - option to use default fragment size on alsa drivers
 - lazy sample cache
-- per-channel volume
 - merge pa_context_connect_*
 - input latency
 - fix tcp/native
 - add volume to create_stream command in native protocol
 - udp based protocol
+- make sure not to allow recursive auto load
+
+*** 0.6 ****
+- per-channel volume
+- unix socket directories include user name
+- add sample directory
 
 ** later ***
 - xmlrpc/http