Merge branch 'master' into windows
authorPaul Davis <paul@linuxaudiosystems.com>
Wed, 17 Jul 2013 12:05:59 +0000 (08:05 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Wed, 17 Jul 2013 12:05:59 +0000 (08:05 -0400)
commit650964f3203319b013c49a286b5fc5fc203f3bbb
tree60b2f879d4ed634f9420a737886086db5eb31f78
parent9cbe231b920d92a2e44e08962a3ed6870b962f34
parent780397d0ccf8df54eeb78c88eebbaab0c2745029
Merge branch 'master' into windows
14 files changed:
gtk2_ardour/export_video_dialog.cc
gtk2_ardour/mixer_strip.cc
gtk2_ardour/processor_box.cc
gtk2_ardour/transcode_video_dialog.cc
libs/ardour/audio_unit.cc
libs/ardour/io.cc
libs/ardour/ladspa_plugin.cc
libs/ardour/lv2_plugin.cc
libs/ardour/meter.cc
libs/ardour/midi_track.cc
libs/ardour/plugin.cc
libs/ardour/route.cc
libs/audiographer/audiographer/debug_utils.h
wscript