From b339fb500a2485a1a4fcbf53c4d86462b08ffa03 Mon Sep 17 00:00:00 2001
From: Dominik Christ <d.christ@wikki.co.uk>
Date: Fri, 15 May 2015 10:21:28 +0100
Subject: [PATCH] Pre-merge clean-up

---
 ListOfContributors                            |  2 ++
 .../conversion/gambitToFoam/gambitToFoam.L    | 32 +++++++++----------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/ListOfContributors b/ListOfContributors
index 36b201f73..8b721e4e6 100644
--- a/ListOfContributors
+++ b/ListOfContributors
@@ -82,3 +82,5 @@ Contents:
     Niklas Wikstrom
     Vanja Skuric
     Alexander Vakhrushev
+    Inno Gatin
+    Alexey Matveichev
diff --git a/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L b/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L
index ce8e61ad9..de4e9e202 100644
--- a/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L
+++ b/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L
@@ -33,9 +33,9 @@ Description
 
 #undef yyFlexLexer
 
-/* ------------------------------------------------------------------------- *\
+ /* ------------------------------------------------------------------------- *\
    ------ local definitions
-\* ------------------------------------------------------------------------- */
+ \* ------------------------------------------------------------------------- */
 
 #include "scalarList.H"
 #include "IStringStream.H"
@@ -150,9 +150,9 @@ nFlags                {space}"NFLAGS:"{space}
 mtype                 {space}"MTYPE:"{space}
 
 
-/* ------------------------------------------------------------------------- *\
+ /* ------------------------------------------------------------------------- *\
                       -----  Exclusive start states -----
-\* ------------------------------------------------------------------------- */
+ \* ------------------------------------------------------------------------- */
 
 %option stack
 
@@ -193,11 +193,11 @@ mtype                 {space}"MTYPE:"{space}
 %}
 
 
-/* ------------------------------------------------------------------------- *\
+ /* ------------------------------------------------------------------------- *\
                             ------ Start Lexing ------
-\* ------------------------------------------------------------------------- */
+ \* ------------------------------------------------------------------------- */
 
-/*                      ------ Reading control header ------                 */
+ /*                      ------ Reading control header ------                 */
 
 {controlInfo} {
         BEGIN(readControlHeader);
@@ -289,7 +289,7 @@ mtype                 {space}"MTYPE:"{space}
     }
 
 
-/*                 ------  Reading nodal coordinates ------                 */
+ /*                 ------  Reading nodal coordinates ------                 */
 
 {nodalCoords}{spaceNl} {
 
@@ -317,7 +317,7 @@ mtype                 {space}"MTYPE:"{space}
     }
 
 
-/*                   ------ Reading cells and elements ------                */
+ /*                   ------ Reading cells and elements ------               */
 
 {cellsAndElements}{spaceNl} {
 
@@ -409,7 +409,7 @@ mtype                 {space}"MTYPE:"{space}
     }
 
 
-/*             ------ Reading element group information ------               */
+ /*             ------ Reading element group information ------               */
 
 {cellStreams}{spaceNl} {
         Info<< "Reading cell streams" << endl;
@@ -515,7 +515,7 @@ mtype                 {space}"MTYPE:"{space}
     }
 
 
-/*            ------  Reading end of section and others ------               */
+ /*            ------  Reading end of section and others ------               */
 
 <cellStreamLabels>{endOfSection}\n {
 
@@ -601,19 +601,19 @@ mtype                 {space}"MTYPE:"{space}
     }
 
 
-/*             ------ Reading end of section and others ------               */
+ /*             ------ Reading end of section and others ------               */
 
 <controlInfo,nodalCoords,cellsAndElements>{endOfSection}\n {
         BEGIN(INITIAL);
     }
 
 
-/* ------ Ignore remaining space and \n s.  Any other characters are errors. */
+ /* ------ Ignore remaining space and \n s.  Any other characters are errors. */
 
 .|\n {}
 
 
-/*  ------ On EOF return to previous file, if none exists terminate. ------  */
+ /*  ------ On EOF return to previous file, if none exists terminate. ------  */
 
 <<EOF>> {
             yyterminate();
@@ -869,6 +869,6 @@ int main(int argc, char *argv[])
 }
 
 
-/* ------------------------------------------------------------------------- *\
+ /* ------------------------------------------------------------------------- *\
     ------ End of gambitToFoam.L
-\* ------------------------------------------------------------------------- */
+ \* ------------------------------------------------------------------------- */