projects / ardour.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d23135f 40d8c5a)
Merge remote-tracking branch 'origin/master' into export-dialog
authorColin Fletcher <colin.m.fletcher@googlemail.com>
Sat, 25 Jan 2014 02:30:55 +0000 (02:30 +0000)
committerColin Fletcher <colin.m.fletcher@googlemail.com>
Sat, 25 Jan 2014 02:30:55 +0000 (02:30 +0000)
1  2 
gtk2_ardour/ardour_ui.cc patch | diff1 | diff2 | blob | history
libs/ardour/wscript patch | diff1 | diff2 | blob | history

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