From 5316931fa1939ec46a74cda4b8c22893deccbe9a Mon Sep 17 00:00:00 2001
From: Damjan Adamic <projectkk2glider@gmail.com>
Date: Mon, 5 May 2014 22:37:04 +0200
Subject: [PATCH] Merge branch 'next'

---
 companion/src/printdialog.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/companion/src/printdialog.cpp b/companion/src/printdialog.cpp
index e347fbd94..70c65bbe3 100644
--- a/companion/src/printdialog.cpp
+++ b/companion/src/printdialog.cpp
@@ -26,7 +26,7 @@ PrintDialog::PrintDialog(QWidget *parent, FirmwareInterface * firmware, GeneralS
 {
   if (gvars) {
     gvarnum=firmware->getCapability(Gvars); 
-  }
+  } 
 
   ui->setupUi(this);
   this->setWindowIcon(CompanionIcon("print.png"));
@@ -127,7 +127,7 @@ void PrintDialog::printSetup()
     str.append(fv(tr("Pulse Polarity"), g_model->moduleData[0].ppmPulsePol ? "NEG" : "POS"));
     str.append(fv(tr("Throttle Trim"), g_model->thrTrim ? tr("Enabled") : tr("Disabled")));
     str.append(fv(tr("Throttle Expo"), g_model->thrExpo ? tr("Enabled") : tr("Disabled")));
-    // TODO    str.append(fv(tr("Trim Switch"), getSWName(g_model->trimSw)));
+    // TODO     str.append(fv(tr("Trim Switch"), getSWName(g_model->trimSw)));
     str.append(fv(tr("Trim Increment"), getTrimInc(g_model)));
     str.append(fv(tr("Center Beep"), getCenterBeep(g_model))); // specify which channels beep
     str.append("</td></tr></table></td>");