Merge branch 'master' into js-dbus
commit4e979b964966b6596eb725916f9ff16932e85880
authorStephane Letz <letz@grame.fr>
Sat, 23 Jul 2011 07:40:34 +0000 (23 09:40 +0200)
committerStephane Letz <letz@grame.fr>
Sat, 23 Jul 2011 07:40:34 +0000 (23 09:40 +0200)
tree436e3fe5fbbf76a25e31578d0a9503d6144b0310
parent299bc1bfe9e536e9b25334364f60a7a75d33c21f
parentbf94bee63310d77f4ac341701d0fa513132dc992
Merge branch 'master' into js-dbus
windows/JackWinNamedPipeServerChannel.cpp