projects / ardour.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f7b140b c4227ca)
Merge branch 'master' into ccmerge
authorRobin Gareus <robin@gareus.org>
Sat, 10 Aug 2013 13:41:40 +0000 (15:41 +0200)
committerRobin Gareus <robin@gareus.org>
Sat, 10 Aug 2013 13:41:40 +0000 (15:41 +0200)
Conflicts:
gtk2_ardour/ardour_ui_options.cc
gtk2_ardour/generic_pluginui.cc
gtk2_ardour/level_meter.cc
gtk2_ardour/utils.cc
gtk2_ardour/utils.h
gtk2_ardour/video_image_frame.cc

1  2 
gtk2_ardour/wscript patch | diff1 | diff2 | blob | history
wscript patch | diff1 | diff2 | blob | history

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