Merge commit 'origin/caching'
commitbe02ac2de7c0a701d1e9a533dc9055d8c53302b6
authorKrzysztof Foltman <wdev@foltman.com>
Sun, 25 Jan 2009 12:50:00 +0000 (25 12:50 +0000)
committerKrzysztof Foltman <wdev@foltman.com>
Sun, 25 Jan 2009 12:50:00 +0000 (25 12:50 +0000)
treeb1f1537a23ec4f3258a02b070ec57cf1f3e3a021
parenta8ea924f0cb442756d42001c970a17d3e75fba06
parentde7d77a09c5cb65e2297178d6ea03f59928cf54b
Merge commit 'origin/caching'

Conflicts:

src/calf/custom_ctl.h
src/calf/custom_ctl.h
src/calf/modules.h
src/custom_ctl.cpp
src/modules_dsp.cpp