projects / ardour.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8216eac 4a135c8)
Merge branch 'master' into windows
authorPaul Davis <paul@linuxaudiosystems.com>
Fri, 6 Sep 2013 14:56:36 +0000 (10:56 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Fri, 6 Sep 2013 14:56:36 +0000 (10:56 -0400)
1  2 
gtk2_ardour/export_video_dialog.cc patch | diff1 | diff2 | blob | history
wscript patch | diff1 | diff2 | blob | history

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