Merge branch 'master' into design
commitd58f86270f7c3ed79b7e0ff3792f0f52fd16b270
authorMarkus Schmidt <schmidt@boomshop.net>
Mon, 4 May 2015 00:47:08 +0000 (4 02:47 +0200)
committerMarkus Schmidt <schmidt@boomshop.net>
Mon, 4 May 2015 00:47:08 +0000 (4 02:47 +0200)
tree4688c932859de6a2fb0d1eac7a3a99635e8137a2
parent26ef38af2491517197d36b105414b8da3885afd5
parent42975f0b5989799c7878b84b41f488d5b6bf6c8f
Merge branch 'master' into design
src/Makefile.am
src/calf/Makefile.am
src/calf/custom_ctl.h
src/calf/gui.h
src/calf/gui_controls.h
src/custom_ctl.cpp
src/gui.cpp
src/gui_controls.cpp