[SCM] calf/master: Merge remote branch 'markus/style'

[js at users.alioth.debian.org]

Merge branch 'master' into style
Merge branch 'master' into style
Styles for Ardour, button-labels in rack, 0dB labels in MBC, Ardour crash
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: d6a3c1a63a147948535a50da009275278ad5e6a3
X-Git-Newrev: 34569260c452f0fa4c543155ebba174a42a343dc

The following commit has been merged in the master branch:
commit db31363ca21cab4dac37517c7aee3d0d74e646a4
Merge: 4a1d996bfdce94d01921ba3219c7693dd8c3461b 49bcfb9bcbca37d4f5905674269f4ec79547de84
Author: Krzysztof Foltman <wdev at foltman.com>
Date:   Wed May 5 00:36:35 2010 +0100

    Merge remote branch 'markus/style'
    
    Conflicts:
    	src/main_win.cpp


-- 
calf audio plugins packaging