projects / ardour.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 69df776 ce7bfb4)
Merge branch 'master' into windows
authorPaul Davis <paul@linuxaudiosystems.com>
Wed, 4 Dec 2013 16:50:36 +0000 (11:50 -0500)
committerPaul Davis <paul@linuxaudiosystems.com>
Wed, 4 Dec 2013 16:50:36 +0000 (11:50 -0500)
1  2 
gtk2_ardour/ardour_ui.cc patch | diff1 | diff2 | blob | history
libs/ardour/audioengine.cc patch | diff1 | diff2 | blob | history

diff --cc gtk2_ardour/ardour_ui.cc
Simple merge
diff --cc libs/ardour/audioengine.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.