diff --git a/SettingsDialog.cpp b/SettingsDialog.cpp
index cfff5dc..e83a150 100644
--- a/SettingsDialog.cpp
+++ b/SettingsDialog.cpp
@@ -33,8 +33,9 @@ SettingsDialog::SettingsDialog(QWidget *parent, Settings &_settings) :
 	ui->lineFossilPath->setText(QDir::toNativeSeparators(settings->Mappings[FUEL_SETTING_FOSSIL_PATH].Value.toString()));
 	ui->lineGDiffCommand->setText(QDir::toNativeSeparators(settings->Mappings[FUEL_SETTING_GDIFF_CMD].Value.toString()));
 	ui->lineGMergeCommand->setText(QDir::toNativeSeparators(settings->Mappings[FUEL_SETTING_GMERGE_CMD].Value.toString()));
-	ui->lineIgnore->setText(settings->Mappings[FUEL_SETTING_IGNORE_GLOB].Value.toString());
 	ui->lineRemoteURL->setText(settings->Mappings[FUEL_SETTING_REMOTE_URL].Value.toString());
+	ui->lineIgnore->setText(settings->Mappings[FUEL_SETTING_IGNORE_GLOB].Value.toString());
+	ui->lineIgnoreCRNL->setText(settings->Mappings[FUEL_SETTING_CRNL_GLOB].Value.toString());
 }
 
 //-----------------------------------------------------------------------------
@@ -56,8 +57,9 @@ void SettingsDialog::on_buttonBox_accepted()
 	settings->Mappings[FUEL_SETTING_FOSSIL_PATH].Value = QDir::fromNativeSeparators(ui->lineFossilPath->text());
 	settings->Mappings[FUEL_SETTING_GDIFF_CMD].Value = QDir::fromNativeSeparators(ui->lineGDiffCommand->text());
 	settings->Mappings[FUEL_SETTING_GMERGE_CMD].Value = QDir::fromNativeSeparators(ui->lineGMergeCommand->text());
-	settings->Mappings[FUEL_SETTING_IGNORE_GLOB].Value = ui->lineIgnore->text();
 	settings->Mappings[FUEL_SETTING_REMOTE_URL].Value = ui->lineRemoteURL->text();
+	settings->Mappings[FUEL_SETTING_IGNORE_GLOB].Value = ui->lineIgnore->text();
+	settings->Mappings[FUEL_SETTING_CRNL_GLOB].Value = ui->lineIgnoreCRNL->text();
 }
 //-----------------------------------------------------------------------------
 void SettingsDialog::on_btnSelectFossil_clicked()
diff --git a/SettingsDialog.h b/SettingsDialog.h
index 39f1f11..45ba50c 100644
--- a/SettingsDialog.h
+++ b/SettingsDialog.h
@@ -14,6 +14,7 @@ namespace Ui {
 #define FUEL_SETTING_GDIFF_CMD		"gdiff-command"
 #define FUEL_SETTING_GMERGE_CMD		"gmerge-command"
 #define FUEL_SETTING_IGNORE_GLOB	"ignore-glob"
+#define FUEL_SETTING_CRNL_GLOB		"crnl-glob"
 #define FUEL_SETTING_REMOTE_URL		"remote-url"
 
 struct Settings
@@ -44,6 +45,7 @@ struct Settings
 		Mappings[FUEL_SETTING_GDIFF_CMD] = Setting("", Setting::TYPE_FOSSIL_GLOBAL);
 		Mappings[FUEL_SETTING_GMERGE_CMD] = Setting("", Setting::TYPE_FOSSIL_GLOBAL);
 		Mappings[FUEL_SETTING_IGNORE_GLOB] = Setting("", Setting::TYPE_FOSSIL_LOCAL);
+		Mappings[FUEL_SETTING_CRNL_GLOB] = Setting("", Setting::TYPE_FOSSIL_LOCAL);
 		Mappings[FUEL_SETTING_REMOTE_URL] = Setting("off", Setting::TYPE_FOSSIL_COMMAND);
 	}
 };
diff --git a/SettingsDialog.ui b/SettingsDialog.ui
index e8d55d3..16d76b3 100644
--- a/SettingsDialog.ui
+++ b/SettingsDialog.ui
@@ -195,32 +195,6 @@
       </attribute>
       <layout class="QFormLayout" name="formLayout_2">
        <item row="0" column="0">
-        <widget class="QLabel" name="label_4">
-         <property name="minimumSize">
-          <size>
-           <width>100</width>
-           <height>0</height>
-          </size>
-         </property>
-         <property name="text">
-          <string>Ignore List</string>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="1">
-        <widget class="QLineEdit" name="lineIgnore">
-         <property name="minimumSize">
-          <size>
-           <width>0</width>
-           <height>0</height>
-          </size>
-         </property>
-         <property name="toolTip">
-          <string>A comma separated list of paths to ignore in fossil operations</string>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="0">
         <widget class="QLabel" name="label_5">
          <property name="minimumSize">
           <size>
@@ -233,7 +207,7 @@
          </property>
         </widget>
        </item>
-       <item row="1" column="1">
+       <item row="0" column="1">
         <widget class="QLineEdit" name="lineRemoteURL">
          <property name="minimumSize">
           <size>
@@ -246,6 +220,58 @@
          </property>
         </widget>
        </item>
+       <item row="1" column="0">
+        <widget class="QLabel" name="label_4">
+         <property name="minimumSize">
+          <size>
+           <width>100</width>
+           <height>0</height>
+          </size>
+         </property>
+         <property name="text">
+          <string>Ignore List</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="1">
+        <widget class="QLineEdit" name="lineIgnore">
+         <property name="minimumSize">
+          <size>
+           <width>0</width>
+           <height>0</height>
+          </size>
+         </property>
+         <property name="toolTip">
+          <string>A comma separated list of paths to ignore in fossil operations</string>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="0">
+        <widget class="QLabel" name="label_7">
+         <property name="minimumSize">
+          <size>
+           <width>100</width>
+           <height>0</height>
+          </size>
+         </property>
+         <property name="text">
+          <string>Ignore CR/NL</string>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="1">
+        <widget class="QLineEdit" name="lineIgnoreCRNL">
+         <property name="minimumSize">
+          <size>
+           <width>0</width>
+           <height>0</height>
+          </size>
+         </property>
+         <property name="toolTip">
+          <string>A comma separated list of paths to ignore in fossil operations</string>
+         </property>
+        </widget>
+       </item>
       </layout>
      </widget>
     </widget>
diff --git a/manifest b/manifest
index 339846b..ef5a774 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Select\sthe\sroot\snode\sin\sthe\sTree\sview\swhen\sopening\sa\sproject\nCommit\sDialog\snow\sdisplays\sthe\sfirst\sline\sprevious\scommit\smessages\sonly\n
-D 2011-10-21T15:46:38.225
+C Added\scrnl-glob\sto\ssettings\n\n
+D 2011-10-21T15:55:36.627
 F CommitDialog.cpp 1b7eff42cbf75805df61c5b7d8edf6253aeaaf15
 F CommitDialog.h 65a7238dcdd41b578536a0b0ac2a65f2e7f23c9a
 F CommitDialog.ui 5067623f6af6f5a42c87df903278e383e945e154
@@ -9,9 +9,9 @@ F FileActionDialog.ui c63644428579741aeb5fa052e237ba799ced9ad7
 F MainWindow.cpp 3ece15d6215da3f74172a55ea8b223d6980dd7a1
 F MainWindow.h 6efb750454037a2a9f7984fce46b5138ff47eac5
 F MainWindow.ui 7f9e5cda55cffd5da8c01de7729a1806126c0d6b
-F SettingsDialog.cpp de1d915826398e418a94370a2a8e22333f765d8c
-F SettingsDialog.h 8306f9db6b90f3aaf85b3d21a208ea42ac9fa4be
-F SettingsDialog.ui 2a7983cc7362da5c1f7075c35dd25947763ba9ee
+F SettingsDialog.cpp 8990d8e16a1300d184d88eee52f976fe872e8f49
+F SettingsDialog.h 9a711860c4f2b491d543c2a01a904c6fb225a8d9
+F SettingsDialog.ui fb24cd91621cdd3c9dcf7de285a3fa65ea6d50a9
 F Utils.cpp 4bd6f104d7d666bdae2bbe54e392e8372f6ca186
 F Utils.h e5ebab82b3455f2ea06d92e6b9eb18355470076c
 F fuel.pro 3dc8e31fde8137143dea0ae44a81eb6733d86168
@@ -174,7 +174,7 @@ F installer/fuel.iss 13b6a938bcdf273cbd3649d2549887baa1577214
 F installer/license.txt 4cc77b90af91e615a64ae04893fdffa7939db84c
 F main.cpp f67a9b5c9ca0b634b19ef08e7136032372d37f93
 F resources.qrc e98383ed205f4e37100c60057e0129c3b86dea53
-P 3ce654a76b15af0c4b7a113cb04314d2906ab1e3
-R 2b709879e85b51559292f98aac79786d
+P 6f0dadf863a147669f09e5661541e2ae6043e2a5
+R 26afbf882288a832383c0e00c91b97f6
 U kostas
-Z e2c7ddbf16615f5508923a2eebc28a25
+Z 3328aecb6f740da2db47c3b81fc47ab1
diff --git a/manifest.uuid b/manifest.uuid
index 3195a92..0e18480 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6f0dadf863a147669f09e5661541e2ae6043e2a5
\ No newline at end of file
+457fb31debab309e4932ca3fb8e6fe6d3c111c6c
\ No newline at end of file