merge with master and fix 4 conflicts by hand

[ardour.git] / gtk2_ardour / video_timeline.cc

diff --git a/gtk2_ardour/video_timeline.cc b/gtk2_ardour/video_timeline.cc
index 0defa56be7a3448ec215de34af7c126cab81d3a5..bcbf19d4f7a3e142767f6b3d6eff6f94d9442421 100644 (file)
--- a/gtk2_ardour/video_timeline.cc
+++ b/gtk2_ardour/video_timeline.cc
@@ -765,7 +765,9 @@ VideoTimeLine::find_xjadeo () {
                _xjadeo_bin = X_("");
                warning << _("Video-monitor 'xjadeo' was not found. Please install http://xjadeo.sf.net/ "
                                "(a custom path to xjadeo can be specified by setting the XJREMOTE environment variable. "
-                               "It should point to an application compatible with xjadeo's remote-control interface 'xjremote').")
+                               "It should point to an application compatible with xjadeo's remote-control interface 'xjremote').\n"
+                               "\n"
+                               "see also http://manual.ardour.org/video-timeline/setup/")
                        << endmsg;
        }
 }