[glom/glom-1-20] 1.20.4

[Murray Cumming <murrayc src gnome org>]

commit fd6e136c41be1129cc86745cbe5150d727242941
Author: Murray Cumming <murrayc murrayc com>
Date:   Fri Dec 30 10:11:38 2011 +0100

    1.20.4

 ChangeLog    |    6 ++++--
 NEWS         |   11 +++++++++++
 configure.ac |    2 +-
 3 files changed, 16 insertions(+), 3 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index f4f121a..5dd2472 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+1.20.4:
+
 2011-12-30  Murray Cumming  <murrayc murrayc com>
 
 	Cut menu: Prevent cutting from non-editable GtkTextViews.
@@ -7,11 +9,11 @@
 
 2011-12-30  Murray Cumming  <murrayc murrayc com>
 
-  Details: Really make non-editable multiline text fields non-editable.
+	Details: Really make non-editable multiline text fields non-editable.
   
 	* glom/mode_data/datawidget/textview.[h|cc]: Override set_read_only(),
 	so that multiline text fields are really non-editable when the formatting
-  specifies that.
+	specifies that.
 
 2011-12-29  Murray Cumming  <murrayc murrayc com>
 
diff --git a/NEWS b/NEWS
index ab01ce6..370bdd9 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,14 @@
+1.20.4 (stable):
+
+* Details: Really make non-editable multiline text fields non-editable.
+  (Murray Cumming)
+* Edit menu: Make the Cut/Copy/Paste menus actually work.
+  (David King, Murray Cumming) Bug #518315 (GÃran)
+* Choices: Make sure related choices are sorted (by ID).
+  The sort order can be specified in Glom 1.21/22.
+* libglom: Document_XML: Remove an unimplemented method.
+  Bug #666744 (yselkowitz)
+
 1.20.3 (stable):
 
 * Details: ID Find button: Really show the quick find feature.
diff --git a/configure.ac b/configure.ac
index f09b9a7..9c5759e 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.20.3],[http://bugzilla.gnome.org/enter_bug.cgi?product=Glom],[glom])
+AC_INIT([Glom],[1.20.4],[http://bugzilla.gnome.org/enter_bug.cgi?product=Glom],[glom])
 AC_PREREQ(2.63)
 
 AC_CONFIG_SRCDIR([glom/main.cc])