projects / ardour.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 394f2b3 2106a12)
Merge branch 'master' into windows
authorPaul Davis <paul@linuxaudiosystems.com>
Sun, 14 Jul 2013 12:27:22 +0000 (08:27 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Sun, 14 Jul 2013 12:27:22 +0000 (08:27 -0400)
1  2 
gtk2_ardour/ardour_ui.cc patch | diff1 | diff2 | blob | history
gtk2_ardour/generic_pluginui.cc patch | diff1 | diff2 | blob | history

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