# HG changeset patch
# User Rik <rik@octave.org>
# Date 1429588162 25200
# Node ID 82b4fb8b8a2822ef2d2ae1e6e546f118bcbd20f7
# Parent  5a47178626482b882f2c56eca2c028f1d7721e37# Parent  248f2f2e7d4872466ee478b51debc63d56c8353d
maint: Merge away accidental head.

diff -r 248f2f2e7d48 -r 82b4fb8b8a28 libgui/graphics/annotation-dialog.cc
--- a/libgui/graphics/annotation-dialog.cc	Mon Apr 20 20:46:54 2015 -0700
+++ b/libgui/graphics/annotation-dialog.cc	Mon Apr 20 20:49:22 2015 -0700
@@ -138,6 +138,7 @@
   props.append (ovl ("fontweight", ui->cb_font_bold->isChecked() ? "bold" : "normal" ));
   props.append (ovl ("fontangle", ui->cb_font_italic->isChecked() ? "italic" : "normal" ));
   props.append (ovl ("color", Utils::toRgb (ui->btn_color->palette ().color (QPalette::Button))));
+  props.append (ovl ("linestyle", ui->cb_line_style->currentText ().toStdString ()));
 }
 
 void
diff -r 248f2f2e7d48 -r 82b4fb8b8a28 libgui/graphics/annotation-dialog.ui
--- a/libgui/graphics/annotation-dialog.ui	Mon Apr 20 20:46:54 2015 -0700
+++ b/libgui/graphics/annotation-dialog.ui	Mon Apr 20 20:49:22 2015 -0700
@@ -1317,17 +1317,7 @@
        <widget class="QComboBox" name="cb_line_style">
         <item>
          <property name="text">
-          <string>left</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>middle</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>right</string>
+          <string>none</string>
          </property>
         </item>
        </widget>