[glom/glom-1-18] 1.18.1

[Murray Cumming <murrayc src gnome org>]

commit 3b89b58d8efc15436fe28df15a0aa97fd9670931
Author: Murray Cumming <murrayc murrayc com>
Date:   Mon Apr 4 11:49:06 2011 +0200

    1.18.1

 ChangeLog    |    2 ++
 NEWS         |   22 +++++++++++++++++++++-
 configure.ac |    2 +-
 3 files changed, 24 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 9b6b273..6580017 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+1.18.1:
+
 2011-04-04  Murray Cumming  <murrayc murrayc com>
 
 	Require the latest mm-common and dist the mm-common scripts.
diff --git a/NEWS b/NEWS
index 9d4dc9c..705d761 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,23 @@
+1.18.1:
+
+* CSV Import: Fix quoted-newline detection, so we don't drop rows.
+  (Murray Cumming) Bug #637529 (Darmon Xavier),
+* libglom:
+  - Avoid the PyDateTime_Check() crash in strange situations such as under JNI.
+  and provide a clue on stderr.
+  See bug #644702
+  (Murray Cumming)
+  - Added utils::build_sql_select_count_rows().
+  (Murray Cumming) Bug #645110 (Ben Konrath)
+* ComboEntry: Really have an entry.
+  (Murray Cumming) Bug #645041 (Ben Konrath)
+* Build:
+  - Require the latest libgdamm, because we use its latest API.
+  - Avoid a tarball-build dependency on mm-common or the mm-common scripts
+  installed by the older version of glibmm.
+  - Make glom-1.18 parallel-installable with glom-1.16
+  (Murray Cumming)
+
 1.18.0:
 
 * Builds with gtkmm-2.24 with no use of deprecated API.
@@ -10,7 +30,7 @@
   Bug #167818
 * Build: Remove the gconfmm dependency, because we don't use it.
   (Murray Cumming)
-	
+
 1.16.1:
 
 Build: Fix the python module's filename.
diff --git a/configure.ac b/configure.ac
index 60ca3e6..df7aff7 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.18.0],[http://bugzilla.gnome.org/enter_bug.cgi?product=Glom],[glom])
+AC_INIT([Glom],[1.18.1],[http://bugzilla.gnome.org/enter_bug.cgi?product=Glom],[glom])
 AC_PREREQ(2.63)
 
 AC_CONFIG_SRCDIR([glom/main.cc])