master merge; new files not added after initial cairocanvas patch application
authorPaul Davis <paul@linuxaudiosystems.com>
Fri, 5 Apr 2013 21:16:33 +0000 (17:16 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Fri, 5 Apr 2013 21:16:33 +0000 (17:16 -0400)
commit8eef4b1904bcc611f5f4230927ca9eda2352d36b
treee004392027fb0208091ffb60baaa597a6d4a95b8
parent07a505b1b271f64a1ffb2da32da0548d32cd13de
master merge; new files not added after initial cairocanvas patch application
31 files changed:
doc/region_ops.txt
gtk2_ardour/ardour.menus.in
gtk2_ardour/ardour_ui.cc
gtk2_ardour/editor.cc
gtk2_ardour/editor.h
gtk2_ardour/editor_actions.cc
gtk2_ardour/editor_ops.cc
gtk2_ardour/editor_videotimeline.cc
gtk2_ardour/export_video_dialog.cc
gtk2_ardour/export_video_dialog.h
gtk2_ardour/hit.cc [new file with mode: 0644]
gtk2_ardour/hit.h [new file with mode: 0644]
gtk2_ardour/note_base.cc [new file with mode: 0644]
gtk2_ardour/note_base.h [new file with mode: 0644]
gtk2_ardour/nsm.cc
gtk2_ardour/nsm.h
gtk2_ardour/public_editor.h
gtk2_ardour/rhythm_ferret.cc
gtk2_ardour/route_time_axis.cc
gtk2_ardour/sys_ex.cc [new file with mode: 0644]
gtk2_ardour/sys_ex.h [new file with mode: 0644]
gtk2_ardour/system_exec.cc
gtk2_ardour/transcode_ffmpeg.cc
gtk2_ardour/video_monitor.cc
gtk2_ardour/video_monitor.h
gtk2_ardour/video_timeline.cc
gtk2_ardour/video_timeline.h
libs/ardour/midi_clock_slave.cc
libs/ardour/session_process.cc
libs/canvas/canvas/fwd.h [new file with mode: 0644]
libs/evoral/evoral/Sequence.hpp