[glom/sqlbuilder2: 67/67] Merged from master, and use SqlBuilder for DISTINCT and LIMIT.

[Murray Cumming <murrayc src gnome org>]

commit 8146ab4fc5fa55b781f53259053cda425c448375
Author: Murray Cumming <murrayc murrayc com>
Date:   Mon Mar 29 18:12:48 2010 +0200

    Merged from master, and use SqlBuilder for DISTINCT and LIMIT.

 ChangeLog |   32 --------------------------------
 1 files changed, 0 insertions(+), 32 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 6eae219..b9f4a99 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,34 +1,3 @@
-<<<<<<<
-2010-02-27  Murray Cumming  <murrayc murrayc com>
-
-  Increase required version of libgdamm.
-  
-	* configure.ac: Increase libgdamm dependency to the last one that doesn't 
-	need libgda 4.1/4.2. We actually need some API that was not in the older one.
-
-2010-02-27  Murray Cumming  <murrayc murrayc com>
-
-  Revert use of SqlBuilder because it requires libgda 4.1,
-  which will not be packaged by the upcoming Ubuntu Lucid, which is an 
-  important version of an important distro.
-   
-2010-02-27  Murray Cumming  <murrayc murrayc com>
-
-	More uses of SqlBuilder for SELECT statements.
-
-2010-02-27  Murray Cumming  <murrayc murrayc com>
-
-  Fix runtime problems with the use of SqlBuilder.
-  
-	* glom/base_db.[h|cc]: query_execute_select(), query_execute(): Catch more 
-  errors and output better debug and error text.
-	get_database_preferences(): Don't bother catching exceptions already caught 
-	by query_execute*().
-	add_standard_tables(): Fix a typo in the SQL query.
-	insert_example_data(): Work around an inability in GdaSqlBuilder to INSERT 
-	a NULL value. I have asked about it on the mailing list.
-
-=======
 2010-03-29  Murray Cumming  <murrayc murrayc com>
 
     Avoid Operation Not Supported warnings at startup.
@@ -485,7 +454,6 @@
 	insert_example_data(): Work around an inability in GdaSqlBuilder to INSERT
 	a NULL value. I have asked about it on the mailing list.
 
->>>>>>>
 2010-02-27  Murray Cumming  <murrayc murrayc com>
 
 	Use Gnome::Gda::SqlBuilder