projects / ardour.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commitcc92c879bfd989aa8de25fdc29fb8d9b2ec7a992
tree408b8e7ee1d5cfabaef3a08c66879c36fa0735f6tree | snapshot
parentf7b140b9184a918c25aff82fb557d1ad51495230commit | diff
parentc4227ca706405a79faf43a1d667a6f017388f8afcommit | diff
Merge branch 'master' into ccmerge

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
gtk2_ardour/wscript diff1 | diff2 | blob | history
wscript diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.