merge with master and fix 2 conflicts
authorPaul Davis <paul@linuxaudiosystems.com>
Thu, 17 Oct 2013 02:06:56 +0000 (22:06 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Thu, 17 Oct 2013 02:06:56 +0000 (22:06 -0400)
commite5888d398350b26ba2cdc634cc9791e90b4fc6b6
tree54f485ea56d034ecba01938fbc680b12884fc136
parent18850253e9f0034fad132e0da07a2651ce041450
parentda5a49067839ec32a016bf1b66c3808ad7cbf699
merge with master and fix 2 conflicts
20 files changed:
gtk2_ardour/ardour_ui.cc
gtk2_ardour/ardour_ui.h
gtk2_ardour/ardour_ui_options.cc
gtk2_ardour/editor.cc
gtk2_ardour/editor.h
gtk2_ardour/editor_ops.cc
gtk2_ardour/editor_videotimeline.cc
gtk2_ardour/gtk_pianokeyboard.c
gtk2_ardour/public_editor.h
gtk2_ardour/rc_option_editor.cc
gtk2_ardour/utils.cc
gtk2_ardour/utils.h
gtk2_ardour/video_monitor.cc
gtk2_ardour/wscript
libs/ardour/ardour/rc_configuration_vars.h
libs/ardour/graph.cc
libs/ardour/wscript
libs/backends/jack/wscript
libs/pbd/stacktrace.cc
wscript