[glom/modification: 32/33] Correct ChangeLog merge

[Murray Cumming <murrayc src gnome org>]

commit 2e9b33edf89b6709e5161559d4bf4e726b9101d2
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Jun 4 20:07:13 2009 +0200

    Correct ChangeLog merge
---
 ChangeLog |   52 ++++++++++++++++++++++++++--------------------------
 1 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index dfde668..62677b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,29 @@
+2009-05-08  Murray Cumming  <murrayc murrayc com>
+
+	record_new(): Take a table_name.
+
+	* glom/base_db_table_data.[h|cc]: record_new(): Take a table_name, 
+	so we can use this to add related records too, to make sure we get all 
+	the necessary default values, lookups, calculations, and extra field 
+	values, and generally reduce duplication.
+	add_related_record_for_field():
+	* glom/dialog_import_csv_progress.cc: on_idle_import():
+	* glom/mode_data/box_data_details.cc: on_button_new(), 
+	on_flowtable_field_edited():
+	* glom/utility_widgets/db_adddel/db_adddel.cc: user_added(): Adapt.
+
+2009-05-07  Murray Cumming  <murrayc murrayc com>
+
+	Tables now have creation and modification fields, appropriately set.
+
+	* glom/base_db.[h|cc]: Added static m_extra_modification_field_values, 
+	to store the field information for the extra modification fields, filled in 
+	init_extra_modification_fields.
+	set_field_value_in_database(): Also set the extra modification field 
+	values.
+	* glom/base_db_table_data.cc: record_new(): Set values for the extra 
+	creation fields, and show them if they are on the layout.
+
 2009-06-04  Murray Cumming  <murrayc murrayc com>
 
 	Show a specific error message when the flie format is too new.
@@ -160,32 +186,6 @@
 	called it whenever the value is changed by the user or set via 
 	set_value(). Fixes bug #565023.
 
-2009-05-8  Murray Cumming  <murrayc murrayc com>
-
-	record_new(): Take a table_name.
-
-	* glom/base_db_table_data.[h|cc]: record_new(): Take a table_name, 
-	so we can use this to add related records too, to make sure we get all 
-	the necessary default values, lookups, calculatoins, and extra field 
-	values, and generally reduce duplication.
-	add_related_record_for_field():
-	* glom/dialog_import_csv_progress.cc: on_idle_import():
-	* glom/mode_data/box_data_details.cc: on_button_new(), 
-	on_flowtable_field_edited():
-	* glom/utility_widgets/db_adddel/db_adddel.cc: user_added(): Adapt.
-
-2009-05-07  Murray Cumming  <murrayc murrayc com>
-
-	Tables now have creation and modification fields, appropriately set.
-
-	* glom/base_db.[h|cc]: Added static m_extra_modification_field_values, 
-	to store the field information for the extra modification fields, filled in 
-	init_extra_modification_fields.
-	set_field_value_in_database(): Also set the extra modification field 
-	values.
-	* glom/base_db_table_data.cc: record_new(): Set values for the extra 
-	creation fields, and show them if they are on the layout.
-
 2009-05-07  Murray Cumming  <murrayc murrayc com>
 
 	Allow non-network-shared connections when using IPv6.