Merge branch 'master' of github.com:mavlink/qgroundcontrol into thread_test

src/ui/designer/QGCXYPlot.ui

@@ -235,6 +235,13 @@
            </property>
           </widget>
          </item>
+         <item>
+          <widget class="QCheckBox" name="timeAxisRange">
+           <property name="text">
+            <string>Time Series</string>
+           </property>
+          </widget>
+         </item>
          <item>
           <spacer name="horizontalSpacer_4">
            <property name="orientation">