Merge branch 'master' into windows+cc
authorJohn Emmas <johne53@tiscali.co.uk>
Sun, 6 Oct 2013 10:56:03 +0000 (11:56 +0100)
committerJohn Emmas <johne53@tiscali.co.uk>
Sun, 6 Oct 2013 10:56:03 +0000 (11:56 +0100)
commit300b484cf6ac14c15e365c4062345d64a61c4b18
treef10b9abedc141192f5c35f9c0f40e94f1d52786d
parent7d78172abfd9b02bcb6809db3f7545e90dbe968d
parent2d5e605bf124c82f77a5a893e540bc176164947d
Merge branch 'master' into windows+cc

Conflicts (hopefully resolved):
gtk2_ardour/ardour_ui.cc
gtk2_ardour/ardour_ui.h
gtk2_ardour/ardour_ui_options.cc
29 files changed:
gtk2_ardour/ardour_ui.cc
gtk2_ardour/ardour_ui.h
gtk2_ardour/ardour_ui_options.cc
gtk2_ardour/audio_clock.cc
gtk2_ardour/editor_ops.cc
gtk2_ardour/export_video_dialog.cc
gtk2_ardour/gtk_pianokeyboard.c
gtk2_ardour/main.cc
gtk2_ardour/mixer_strip.cc
gtk2_ardour/plugin_selector.cc
gtk2_ardour/processor_box.cc
gtk2_ardour/rc_option_editor.cc
gtk2_ardour/sfdb_ui.cc
gtk2_ardour/transcode_video_dialog.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/ardour/session.h
libs/ardour/audioengine.cc
libs/ardour/globals.cc
libs/ardour/graph.cc
libs/ardour/session.cc
libs/ardour/session_state.cc
libs/ardour/utils.cc
libs/ardour/wscript
libs/pbd/stacktrace.cc
wscript