merge with master and fix Searchpath conflict
authorPaul Davis <paul@linuxaudiosystems.com>
Thu, 12 Sep 2013 15:40:56 +0000 (11:40 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Thu, 12 Sep 2013 15:40:56 +0000 (11:40 -0400)
commitc985a64d5851634a77bc013a7f66ef8d9ccefcae
tree58c6e2e56e921ec1bed0086d6c15a2630e29b563
parent4a6412aebe4f18578f201e99ddc74fc5d9cb6bfc
merge with master and fix Searchpath conflict
libs/backends/jack/jack_utils.cc