Merge branch 'ardour'

doc/Doxyfile

@@ -1337,7 +1337,7 @@ HTML_COLORSTYLE_GAMMA  = 113
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_TIMESTAMP         = NO
+HTML_TIMESTAMP         = YES
 
 # If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
 # documentation will contain a main index with vertical navigation menus that

doc/mainpage.md

@@ -54,7 +54,7 @@ A few specific libraries are compiled statically (e.g. fluidsynth for use in plu
 
      Handling Standard %MIDI File (Evoral::SMF) format. Abstracted to C++ in SMF.{cc,h}
 
-* libs/backends/
+* `libs/backends/`
 
    Interaction with Operating System's Audio/MIDI API:
    ALSA, CoreAudio, JACK, PortAudio/ASIO, PulseAudio
@@ -72,7 +72,7 @@ A few specific libraries are compiled statically (e.g. fluidsynth for use in plu
 
    %MIDI parsing, MIDNAM handling, Port abstraction for I/O
 
-* `libs/temporal`
+* `libs/temporal/`
 
    Various utility code for dealing with different kinds of time,
    including Timecode, and musical time conversions (Temporal::Beats, Temporal::BBT_Time).
@@ -103,7 +103,7 @@ A few specific libraries are compiled statically (e.g. fluidsynth for use in plu
 
 ### UI related libs
 
-* libs/gtkmm2ext/
+* `libs/gtkmm2ext/`
 
    Utility Library to extend GDK, GTK, and basic abstraction for UIs
    and event-loops. This library is not limited to the GUI, but also
@@ -125,7 +125,7 @@ A few specific libraries are compiled statically (e.g. fluidsynth for use in plu
 
    Threaded waveform rendering and waveform image cache.
 
-* libs/tk/
+* `libs/tk/`
 
   A localized version of GTK+2, renamed as YTK. See Gtk namespace for relevant documentation.
 

gtk2_ardour/editor.cc

@@ -7256,6 +7256,7 @@ Editor::start_track_drag (TimeAxisView& tav, int y, Gtk::Widget& w)
 {
 	track_drag = new TrackDrag (dynamic_cast<RouteTimeAxisView*> (&tav), *_session);
 	DEBUG_TRACE (DEBUG::TrackDrag, string_compose ("start track drag with %1\n", track_drag));
+	PBD::stacktrace (std::cerr, 20);
 
 	track_drag->drag_cursor = _cursors->move->gobj();
 	track_drag->predrag_cursor = gdk_window_get_cursor (edit_controls_vbox.get_window()->gobj());

tools/osx_packaging/osx_build

@@ -635,7 +635,7 @@ mkdir $PRODUCT_PKG_DIR
 DMGWINBOTTOM=440
 DMGBACKGROUND=dmgbg
 
-if [ x$MIXBUS != x ] ; then
+if [ x$MIXBUS != x -o x$LIVETRAX != x] ; then
 
 	# Mixbus packaging