projects / ardour.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 934e827 10933e2)
Merge branch 'master' into cairocanvas
authorPaul Davis <paul@linuxaudiosystems.com>
Thu, 16 Jan 2014 22:26:50 +0000 (17:26 -0500)
committerPaul Davis <paul@linuxaudiosystems.com>
Thu, 16 Jan 2014 22:26:50 +0000 (17:26 -0500)
1  2 
libs/ardour/ardour/auditioner.h patch | diff1 | diff2 | blob | history
libs/ardour/route.cc patch | diff1 | diff2 | blob | history
libs/ardour/session.cc patch | diff1 | diff2 | blob | history

diff --cc libs/ardour/ardour/auditioner.h
Simple merge
diff --cc libs/ardour/route.cc
Simple merge
diff --cc libs/ardour/session.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.