projects / ardour.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 66aa6df fd23ebd)
Merge remote-tracking branch 'remotes/origin/cairocanvas' into windows
authorJohn Emmas <johne53@tiscali.co.uk>
Sat, 21 Sep 2013 08:17:25 +0000 (09:17 +0100)
committerJohn Emmas <johne53@tiscali.co.uk>
Sat, 21 Sep 2013 08:17:25 +0000 (09:17 +0100)
commit19bb2b33a89a1291451f0740739a36daebe00bae
treed0cafb4792ec4ff61d04d16c1e86199b2714a36ftree | snapshot
parent66aa6dfc8ecdb7591768bc45866a8c2b0d77e767commit | diff
parentfd23ebd0886cd61f8ee68d52d6576d00a16c9032commit | diff
Merge remote-tracking branch 'remotes/origin/cairocanvas' into windows

Conflicts (hopefully resolved):
gtk2_ardour/marker.cc
gtk2_ardour/midi_region_view.h
gtk2_ardour/region_gain_line.h
gtk2_ardour/utils.cc
gtk2_ardour/video_image_frame.cc
gtk2_ardour/wscript
libs/backends/jack/wscript
28 files changed:
gtk2_ardour/ardour_ui.cc diff1 | diff2 | blob | history
gtk2_ardour/ardour_ui.h diff1 | diff2 | blob | history
gtk2_ardour/audio_region_editor.h diff1 | diff2 | blob | history
gtk2_ardour/audio_region_view.h diff1 | diff2 | blob | history
gtk2_ardour/audio_time_axis.cc diff1 | diff2 | blob | history
gtk2_ardour/automation_time_axis.cc diff1 | diff2 | blob | history
gtk2_ardour/editor_markers.cc diff1 | diff2 | blob | history
gtk2_ardour/editor_rulers.cc diff1 | diff2 | blob | history
gtk2_ardour/editor_videotimeline.cc diff1 | diff2 | blob | history
gtk2_ardour/generic_pluginui.cc diff1 | diff2 | blob | history
gtk2_ardour/midi_time_axis.cc diff1 | diff2 | blob | history
gtk2_ardour/region_view.h diff1 | diff2 | blob | history
gtk2_ardour/route_time_axis.cc diff1 | diff2 | blob | history
gtk2_ardour/ui_config.cc diff1 | diff2 | blob | history
gtk2_ardour/utils.cc diff1 | diff2 | blob | history
gtk2_ardour/video_image_frame.cc diff1 | diff2 | blob | history
gtk2_ardour/video_monitor.cc diff1 | diff2 | blob | history
gtk2_ardour/video_timeline.cc diff1 | diff2 | blob | history
gtk2_ardour/wscript diff1 | diff2 | blob | history
libs/ardour/ardour/silentfilesource.h diff1 | diff2 | blob | history
libs/ardour/audiosource.cc diff1 | diff2 | blob | history
libs/ardour/graph.cc diff1 | diff2 | blob | history
libs/ardour/ltc_slave.cc diff1 | diff2 | blob | history
libs/ardour/midi_diskstream.cc diff1 | diff2 | blob | history
libs/ardour/wscript diff1 | diff2 | blob | history
libs/backends/jack/wscript diff1 | diff2 | blob | history
libs/surfaces/control_protocol/wscript diff1 | diff2 | blob | history
wscript diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.