projects / ardour.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4a135c8 0456788)
fix merge conflicts with audioengine
authorPaul Davis <paul@linuxaudiosystems.com>
Fri, 6 Sep 2013 17:39:26 +0000 (13:39 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Fri, 6 Sep 2013 17:39:26 +0000 (13:39 -0400)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.