From 255190589527a6dbe4a6ef26f39abb126d348649 Mon Sep 17 00:00:00 2001
From: don bright <hugh.m.bright@gmail.com>
Date: Fri, 20 Jul 2012 21:55:14 -0500
Subject: fix OpenCSG Warning bug where slots were not connected


diff --git a/src/OpenCSGWarningDialog.cc b/src/OpenCSGWarningDialog.cc
index 5648576..926a55b 100644
--- a/src/OpenCSGWarningDialog.cc
+++ b/src/OpenCSGWarningDialog.cc
@@ -8,12 +8,12 @@ OpenCSGWarningDialog::OpenCSGWarningDialog(QWidget*)
 	connect(this->showBox, SIGNAL(toggled(bool)),
 					Preferences::inst()->openCSGWarningBox, SLOT(setChecked(bool)));
 	connect(this->showBox, SIGNAL(toggled(bool)),
-					Preferences::inst(), SLOT(openCSGWarningChanged(bool)));
+					Preferences::inst(), SLOT(on_openCSGWarningBox_toggled(bool)));
 
 	connect(this->enableOpenCSGBox, SIGNAL(toggled(bool)),
 					Preferences::inst()->enableOpenCSGBox, SLOT(setChecked(bool)));
 	connect(this->enableOpenCSGBox, SIGNAL(toggled(bool)),
-					Preferences::inst(), SLOT(enableOpenCSGChanged(bool)));
+					Preferences::inst(), SLOT(on_enableOpenCSGBox_toggled(bool)));
 }
 
 void OpenCSGWarningDialog::setText(const QString &text)
-- 
cgit v0.10.1


From 354aa17feeec0e3a311d804534812050520186bd Mon Sep 17 00:00:00 2001
From: don bright <hugh.m.bright@gmail.com>
Date: Sun, 22 Jul 2012 22:16:52 -0500
Subject: add git clone info to README.md , for openscad and MCAD


diff --git a/README.md b/README.md
index 9da6386..6dfd821 100644
--- a/README.md
+++ b/README.md
@@ -97,6 +97,20 @@ Follow the instructions for the platform you're compiling on below.
 * [Bison (2.4)](http://www.gnu.org/software/bison/)
 * [Flex (2.5.35)](http://flex.sourceforge.net/)
 
+### Getting the source code
+
+Install git (http://git-scm.com/) onto your system. Then run a clone:
+
+    git clone git://github.com/openscad/openscad.git
+
+This will download the latest sources into a directory named 'openscad'. 
+
+To pull the MCAD library (http://reprap.org/wiki/MCAD), do the following:
+
+    cd openscad
+    git submodule init
+    git submodule update
+
 ### Building for Mac OS X
 
 First, make sure that you have XCode installed to get GCC. Then after
-- 
cgit v0.10.1


From 1d40052f82ac50d70914c9abad2c8ada1837a83b Mon Sep 17 00:00:00 2001
From: don bright <hugh.m.bright@gmail.com>
Date: Sun, 22 Jul 2012 22:19:42 -0500
Subject: remove opencsg code that belongs in another branch


diff --git a/src/OpenCSGWarningDialog.cc b/src/OpenCSGWarningDialog.cc
index 926a55b..1ed9217 100644
--- a/src/OpenCSGWarningDialog.cc
+++ b/src/OpenCSGWarningDialog.cc
@@ -8,12 +8,12 @@ OpenCSGWarningDialog::OpenCSGWarningDialog(QWidget*)
 	connect(this->showBox, SIGNAL(toggled(bool)),
 					Preferences::inst()->openCSGWarningBox, SLOT(setChecked(bool)));
 	connect(this->showBox, SIGNAL(toggled(bool)),
-					Preferences::inst(), SLOT(on_openCSGWarningBox_toggled(bool)));
+					Preferences::inst(), SLOT(enableOpenCSGChanged(bool)));
 
 	connect(this->enableOpenCSGBox, SIGNAL(toggled(bool)),
 					Preferences::inst()->enableOpenCSGBox, SLOT(setChecked(bool)));
 	connect(this->enableOpenCSGBox, SIGNAL(toggled(bool)),
-					Preferences::inst(), SLOT(on_enableOpenCSGBox_toggled(bool)));
+					Preferences::inst(), SLOT(enableOpenCSGChanged(bool)));
 }
 
 void OpenCSGWarningDialog::setText(const QString &text)
-- 
cgit v0.10.1


From 54c7cb2422ee59fa456b1d152f2461afea8dfacf Mon Sep 17 00:00:00 2001
From: don bright <hugh.m.bright@gmail.com>
Date: Sun, 22 Jul 2012 22:20:40 -0500
Subject: remove code that belongs in another branch


diff --git a/src/OpenCSGWarningDialog.cc b/src/OpenCSGWarningDialog.cc
index 1ed9217..5648576 100644
--- a/src/OpenCSGWarningDialog.cc
+++ b/src/OpenCSGWarningDialog.cc
@@ -8,7 +8,7 @@ OpenCSGWarningDialog::OpenCSGWarningDialog(QWidget*)
 	connect(this->showBox, SIGNAL(toggled(bool)),
 					Preferences::inst()->openCSGWarningBox, SLOT(setChecked(bool)));
 	connect(this->showBox, SIGNAL(toggled(bool)),
-					Preferences::inst(), SLOT(enableOpenCSGChanged(bool)));
+					Preferences::inst(), SLOT(openCSGWarningChanged(bool)));
 
 	connect(this->enableOpenCSGBox, SIGNAL(toggled(bool)),
 					Preferences::inst()->enableOpenCSGBox, SLOT(setChecked(bool)));
-- 
cgit v0.10.1