cazure
diff --git a/‎Documents/4 Help_New/topics/FlexRay_Controller_Config.dita
+1 b/‎Documents/4 Help_New/topics/FlexRay_Controller_Config.dita
+1
diff --git a/‎Documents/4 Help_New/topics/what_is_new.dita
+6 b/‎Documents/4 Help_New/topics/what_is_new.dita
+6
diff --git a/‎Installation Setup/BUSMASTER INSTALL SCRIPT.nsi
+3-1 b/‎Installation Setup/BUSMASTER INSTALL SCRIPT.nsi
+3-1
diff --git a/‎Installation Setup/NSISHeaders.nsh
+1-1 b/‎Installation Setup/NSISHeaders.nsh
+1-1
diff --git a/‎Sources/Application/Application.cpp
+187-233 b/‎Sources/Application/Application.cpp
+187-233
@@ -21,6 +21,7 @@
     <p>Currently BUSMASTER Supports the following FlexRay Controllers.</p>
     <p><ol>
         <li> ETAS BOA Controllers.</li>
+        <li> GIGATRONIK flex-i Controller.</li>
       </ol></p>
     <p><b>Selecting Controller:</b></p>
     <p>Before Selecting the controlletr the BUSMASTER has to be configured with the proper FIBEX File.Refer <b>Cluster Configuration</b> for more information.</p>
 
@@ -15,6 +15,12 @@
     </metadata>
   </prolog>
   <body>
+    <p><b>2.6.1</b></p>
+    <p>Following features are added:</p>
+    <p><ul>
+        <li>Support for FlexRay GIGATRONIK flex-i Controller.</li>
+        <li>Bug Fixes</li>
+      </ul></p>
     <p><b>2.6.0</b></p>
     <p>Following features are added:</p>
     <p><ul>
 
@@ -30,7 +30,7 @@
 !define MUI_HEADERIMAGE
 !define MUI_HEADERIMAGE_BITMAP "headerimage.bmp"
 !define MUI_ICON  "..\Sources\Application\Res\BUSMASTER.ico"
-!define MUI_UNICON "..\Sources\Application\Res\BUSMASTER.ico"
+!define MUI_UNICON "..\Sources\Application\Res\Uninstaller.ico"
 
 !macro StrStr ResultVar String SubString
   Push `${String}`
@@ -331,6 +331,7 @@ Section "BUSMASTER"
   Delete "$INSTDIR\FLEXRAY_ETAS_BOA_1_4.dll"
   Delete "$INSTDIR\FLEXRAY_ETAS_BOA_1_5.dll"
   Delete "$INSTDIR\FLEXRAY_ETAS_BOA_2.dll"
+  Delete "$INSTDIR\FlexRay_GIGATRONIK_flex-i.dll"
   Delete "$INSTDIR\LIN_ETAS_BOA.dll"
   Delete "$INSTDIR\TXWindowFlexRay.dll"
   Delete "$INSTDIR\LIN_Vector_XL.dll"
@@ -455,6 +456,7 @@ Section "BUSMASTER"
   File ..\Sources\BIN\Release\FLEXRAY_ETAS_BOA_1_4.dll
   File ..\Sources\BIN\Release\FLEXRAY_ETAS_BOA_1_5.dll
   File ..\Sources\BIN\Release\FLEXRAY_ETAS_BOA_2.dll
+  File ..\Sources\BIN\Release\FlexRay_GIGATRONIK_flex-i.dll
   File ..\Sources\BIN\Release\LIN_ETAS_BOA.dll
   File ..\Sources\BIN\Release\TXWindowFlexRay.dll
   File ..\Sources\BIN\Release\Controller_0.dll
 
@@ -29,4 +29,4 @@
 !define StrStr "!insertmacro StrStr"
 
 /* BUSMASTER Version to be updated for every release */
-!define VERSION "2.6.0"
+!define VERSION "2.6.1"