[glom] Fixed merge conflict.

[Murray Cumming <murrayc src gnome org>]

commit 3780440f22d233169e2f17b057078473f21be442
Author: Murray Cumming <murrayc murrayc com>
Date:   Mon Feb 8 09:08:34 2010 +0100

    Fixed merge conflict.

 ChangeLog    |   27 +++++++++++++++------------
 NEWS         |   19 +++++++++++++++++++
 configure.ac |    4 ++--
 3 files changed, 36 insertions(+), 14 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 65f1c1f..bee7cd9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+1.13.3:
+
 2010-02-03  Michael Hasselmann  <michaelh openismus com>
 
 	Fixed a crash that got uncovered by the previous commit
@@ -5,6 +7,7 @@
 	* glom/libglom/utils.cc (build_sql_select_fields_to_get): Warn about layout
 	items that are null and skip them.
 
+2010-02-03  Michael Hasselmann  <michaelh openismus com>
 
 	Added a guard clause when adding relationships from fields
 
@@ -15,7 +18,7 @@
 
 2010-02-02  Murray Cumming  <murrayc murrayc com>
 
-  Do not include pygtk.h
+	Do not include pygtk.h
   
 	* glom/libglom/python_embed/py_glom_record.h:
 	* glom/libglom/python_embed/py_glom_relatedrecord.h:
@@ -24,14 +27,14 @@
 
 2010-01-31  Murray Cumming  <murrayc murrayc com>
 
-  Command-line parsing: Added some checks.
+	Command-line parsing: Added some checks.
   
 	* glom/main.cc: Test the command-line argument filepath for existence and 
 	check that it's not a directory, so it fails before even showing UI.
 
 2010-01-31  Murray Cumming  <murrayc murrayc com>
 
-  Relationships Overview: Avoid GTK+ warnings.
+	Relationships Overview: Avoid GTK+ warnings.
   
 	* glom/mode_design/relationships_overview/dialog_relationships_overview.cc:
 	Constructor: Call add_accel_group(), which fixes the warnings during 
@@ -39,15 +42,15 @@
 
 2010-01-31  Murray Cumming  <murrayc murrayc com>
 
-  Relationships Overview: Maybe fix a hang/crash.
+	Relationships Overview: Maybe fix a hang/crash.
     
-  * glom/mode_design/relationships_overview/dialog_relationships_overview.[h|cc]:
-  Signal handlers: Take sigc::bind() RefPtr parameters by value instead of by
-  const &, to avoid having to use sigc::ref() or worry if it works.
-  Save sigc::connections in a list so we can disconnect signal handlers when
-  deleting items bound with sigc::bind(). Do this in the destructor too, which
-  seems to fix the valgrind errors in bug #594737, though not the
-  instance of invalid non-instantiatable type" warning.
+	* glom/mode_design/relationships_overview/dialog_relationships_overview.[h|cc]:
+	Signal handlers: Take sigc::bind() RefPtr parameters by value instead of by
+	const &, to avoid having to use sigc::ref() or worry if it works.
+	Save sigc::connections in a list so we can disconnect signal handlers when
+	deleting items bound with sigc::bind(). Do this in the destructor too, which
+	seems to fix the valgrind errors in bug #594737, though not the
+	instance of invalid non-instantiatable type" warning.
     	
 2010-01-27  Michael Hasselmann  <michaelh openismus com>
 
@@ -66,7 +69,7 @@
 
 	Added a test for BGO bug #607938
 
-* tests/import/data/albums.csv: Real-world example data used for the CSV
+	* tests/import/data/albums.csv: Real-world example data used for the CSV
 	import.
 
 	* tests/import/utils.[h|cc]: Add the possibility to feed a filename into the
diff --git a/NEWS b/NEWS
index e0763cf..dd9c220 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,22 @@
+1.13.3 (unstable):
+
+* Relationships Overview: Avoid a crash and a warning when closing.
+  (Murray Cumming) Bug #607938 (Michael Hasselmann)
+* Import: Avoid a hang, hopefully.
+  (Michael Hasselmann)
+* Import: Fixed out-ouf-bounds crash.
+  (Michael Hasselmann)  Bug #607938 (ialx).
+* New file: Allow the title to contain quotes, avoiding weird errors.
+  (Murray Cumming) Bug #607957 (Michael Hasselmann)
+* libglom:
+  - Improved include paths used in headers.
+  (Murray Cumming)
+  - Avoid crashes with invalid parameter values.
+  (Michael Hasselmann)
+* Use Gtk::ToolPalette, requiring gtkmm 2.19.4, instead of code copied from libegg.
+* Command-line arguments: Do some checks.
+  (Murray Cumming)
+
 1.13.2 (unstable):
 
 * Details layout: Really use the new formatting options (horizontal alignment, 
diff --git a/configure.ac b/configure.ac
index 82fd71d..55dfaff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@
 ## You should have received a copy of the GNU General Public License
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-AC_INIT([Glom], [1.13.2], [http://bugzilla.gnome.org/enter_bug.cgi?product=Glom], [glom])
+AC_INIT([Glom], [1.13.3], [http://bugzilla.gnome.org/enter_bug.cgi?product=Glom], [glom])
 AC_PREREQ([2.60])
 
 AC_CONFIG_SRCDIR([glom/main.cc])
@@ -152,7 +152,7 @@ AS_IF([test "x$glom_host_win32" != xyes],
       [REQUIRED_LIBGLOM_LIBS="$REQUIRED_LIBGLOM_LIBS libepc-1.0 >= 0.3.1 avahi-ui"])
 
 # Libraries used by Glom:
-REQUIRED_GLOM_LIBS="$REQUIRED_LIBGLOM_LIBS gtkmm-2.4 >= 2.14 gthread-2.0 gconfmm-2.6 libxml++-2.6 libxslt >= 1.1.10 goocanvasmm-1.0 >= 0.14.0"
+REQUIRED_GLOM_LIBS="$REQUIRED_LIBGLOM_LIBS gtkmm-2.4 >= 2.14.9 gthread-2.0 gconfmm-2.6 libxml++-2.6 libxslt >= 1.1.10 goocanvasmm-1.0 >= 0.14.0"
 
 # Do not require iso-codes in client-only mode, or on Windows:
 # TODO: Package iso-codes for Windows?