From 1f3f718a50b8138194057b3827459e402006b0f6 Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri, 24 Sep 2010 15:07:17 +0100
Subject: [PATCH] Release 1.4.0 (stable)

---
 NEWS         | 33 +++++++++++++++++++++++++++++++++
 configure.ac |  4 ++--
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index ad2e584e1..6ccc96d7f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,36 @@
+Clutter 1.4.0  (24/09/2010)
+===============================================================================
+
+  • List of changes since Clutter 1.3.14
+
+    » Add support for describing ClutterState states using ClutterAnimators
+      in ClutterScript.
+
+    » Build fixes
+
+    » Include ClutterConstraints into the allocation phase, to avoid layout
+      cycles and improve the performance.
+
+    » Add new recipes to the Cookbook to illustrate constraints-based
+      layouts.
+
+    » Fix the request mode of ClutterBoxLayout.
+
+    » Fix the handling of transformations in ClutterOffscreenEffect.
+
+    » Documentation and introspection fixes.
+
+Many thanks to:
+
+  Elliot Smith
+  Robert Bragg
+  Neil Roberts
+  Bastian Winkler
+  Dominique Leuenberger
+  Frederik Hahne
+  Jammy Zhou
+  Øyvind Kolås
+
 Clutter 1.3.14 (15/09/2010)
 ===============================================================================
 
diff --git a/configure.ac b/configure.ac
index 47162df39..b57f77819 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,8 +11,8 @@
 # - increase clutter_micro_version to the next odd number
 # - increase clutter_interface_version to the next odd number
 m4_define([clutter_major_version], [1])
-m4_define([clutter_minor_version], [3])
-m4_define([clutter_micro_version], [15])
+m4_define([clutter_minor_version], [4])
+m4_define([clutter_micro_version], [0])
 
 m4_define([clutter_release_status],
           [m4_if(m4_eval(clutter_micro_version % 2), [1], [git],