diff options
| author | Robin Gareus <robin@gareus.org> | 2013-08-10 15:41:40 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2013-08-10 15:41:40 +0200 |
| commit | cc92c879bfd989aa8de25fdc29fb8d9b2ec7a992 (patch) | |
| tree | 408b8e7ee1d5cfabaef3a08c66879c36fa0735f6 /libs/midi++2/port.cc | |
| parent | f7b140b9184a918c25aff82fb557d1ad51495230 (diff) | |
| parent | c4227ca706405a79faf43a1d667a6f017388f8af (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
Diffstat (limited to 'libs/midi++2/port.cc')
0 files changed, 0 insertions, 0 deletions