Merge branch 'master' of https://github.com/OpenModelica/OMEdit

OpenModelica · Dec 12, 2016 · 33f3c33 · 33f3c33
2 parents a3df365 + db43981
commit 33f3c33
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/OMEdit/OMEditGUI/CrashReport/CrashReportDialog.cpp b/OMEdit/OMEditGUI/CrashReport/CrashReportDialog.cpp
@@ -60,7 +60,7 @@ CrashReportDialog::CrashReportDialog()
   // bug description label and textbox
   mpBugDescriptionLabel = new Label(tr("Describe in a few words what you were doing when the error occurred:"));
   mpBugDescriptionTextBox = new QPlainTextEdit(
-    QString("OMEdit %1 connected to OMC %2%5.\nThe running OS is %3 on %4.\n").arg(GIT_SHA,Helper::OpenModelicaVersion,
+    QString("%1 connected to %2%5.\nThe running OS is %3 on %4.\n").arg(GIT_SHA,Helper::OpenModelicaVersion,
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 4, 0))
   QSysInfo::prettyProductName(), QSysInfo::currentCpuArchitecture(),
 #elif defined(__APPLE__)

diff --git a/OMEdit/OMEditGUI/omc_config.h.in b/OMEdit/OMEditGUI/omc_config.h.in
@@ -1,3 +1,3 @@
 #define CONFIG_DEFAULT_OPENMODELICAHOME "@OPENMODELICAHOME@"
-#define GIT_SHA "OMEdit " "@SOURCE_REVISION@"
+#define GIT_SHA "@SOURCE_REVISION@"
 @LSB_RELEASE@
diff --git a/common b/common