From ad15bc7dc275b0ecc19e961d15ffbb538c18a2c3 Mon Sep 17 00:00:00 2001
From: Torsten Paul <Torsten.Paul@gmx.de>
Date: Fri, 3 Jan 2014 19:17:31 +0100
Subject: Update .gitignore.


diff --git a/.gitignore b/.gitignore
index 040fe53..fc30933 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@
 *.tar*
 Makefile
 objects
+.gdbinit
 /*.stl
 /*.dxf
 /lexer_lex.cpp
@@ -15,3 +16,7 @@ parser_yacc.h
 /nbproject
 /openscad
 /tests/openscad_nogui
+testdata/scad/features/import_dxf-tests.scad
+testdata/scad/features/import_stl-tests.scad
+testdata/scad/misc/include-tests.scad
+testdata/scad/misc/use-tests.scad
-- 
cgit v0.10.1


From c350f428b75ca8c9e85616aff50cdbe5e9033331 Mon Sep 17 00:00:00 2001
From: Torsten Paul <Torsten.Paul@gmx.de>
Date: Fri, 3 Jan 2014 19:25:37 +0100
Subject: Update comment to reflect changed behavior.


diff --git a/src/Preferences.cc b/src/Preferences.cc
index 591ccf6..8104a79 100644
--- a/src/Preferences.cc
+++ b/src/Preferences.cc
@@ -210,10 +210,9 @@ void Preferences::featuresCheckBoxToggled(bool state)
 /**
  * Setup feature GUI and synchronize the Qt settings with the feature values.
  * 
- * In case a feature was enabled on the commandline this will have precedence
- * and cause the checkbox in the settings GUI to be not editable.
- * Otherwise the value from the Qt settings is pushed into the feature state
- * and the checkbox is initialized accordingly.
+ * When running in GUI mode, the feature setting that might have been set
+ * from commandline is ignored. This always uses the value coming from the
+ * QSettings.
  */
 void
 Preferences::setupFeaturesPage()
-- 
cgit v0.10.1