Version 1.4.0.

2004-09-13  Christian Persch  <chpe@cvs.gnome.org>

	* NEWS:
	* configure.in:

	Version 1.4.0.

3 files changed, 72 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 96f74c7b5..82e8826ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-09-13  Christian Persch  <chpe@cvs.gnome.org>
+
+	* NEWS:
+	* configure.in:
+
+	Version 1.4.0.
+
 2004-09-11  Shaun McCance  <shaunm@gnome.org>
 
 	* help/C/epiphany.xml:
@@ -11,7 +18,9 @@
 
 2004-09-05  Pawan Chitrakar  <pawan@nplinux.org>
 
-	* configure.in: Add "ne" Nepali in ALL_LINGUAS
+	* configure.in:
+
+	 Add "ne" Nepali in ALL_LINGUAS
 
 2004-09-05  Christian Persch  <chpe@cvs.gnome.org>
 
diff --git a/NEWS b/NEWS
index 114224837..12d32e5a4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,39 @@
 ==============
+Epiphany 1.4.0
+==============
+
+Bug fixes
+
+	* Fix invisible status icon (Christian) [#151501]
+
+Documentation updates
+
+	* Document popup window functionality (Adam) [#145412]
+
+Translation updates
+
+	* Abdulaziz Al-Arfaj (ar)
+	* Vladimir "Kaladan" Petkov (bg)
+	* Progga (bn)
+	* Kenan Hadžiavdić (bs)
+	* Jordi Mallach (ca)
+	* Dafydd Harries (cy)
+	* Ole Laursen (da)
+	* Nikos Charonitakis (el)
+	* Hasbullah Bin Pit (ms)
+	* Kjartan Maraas (nb)
+	* Pawan Chitrakar (ne)
+	* Reinout van Schouwen (nl)
+	* Åsmund Skjæveland (nn)
+	* Kjartan Maraas (no)
+	* Estêvão Samuel Procópio (pt_BR)
+	* Isriya Paireepairit (th)
+	* Ercin Eker (tr)
+	* Mugurel Tudor (ro)
+	* Ching-Hung Lin (zh_TW)
+
+
+==============
 Epiphany 1.3.8
 ==============
 
@@ -507,6 +542,30 @@ Translations
 
 
 ==============
+Epiphany 1.2.9
+==============
+
+Code changes
+
+	* Drop support for Mozilla 1.8a2
+	* Support for Mozilla 1.8a3 and 1.8a4
+
+Bug fixes
+
+	* Fix default horizontal scroll wheel action (Christian) [#148557]
+	* Fix glade symbol lookup with newer libtools (Christian) [#150673]
+	* Pop up context menu with menu keys too (Christian) [#150830]
+	* Fix printing to file with a non-absolute path (Christian) [#148849]
+	* Fix session file remove command (Christian)
+
+Translations
+
+	* Iñaki Larrañaga Murgoitio (eu)
+	* Nirav, Ankit, Ankur, Atit, Bhavin, Kartik, Khushbu, Sweta (gu)
+	* Isriya Paireepairit (th)
+
+
+==============
 Epiphany 1.2.8
 ==============
 
diff --git a/configure.in b/configure.in
index d23f59bc2..1cbc4096f 100644
--- a/configure.in
+++ b/configure.in
@@ -1,11 +1,11 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT([GNOME Web browser], [1.3.8.90],
+AC_INIT([GNOME Web browser], [1.4.0],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany])
 
 GNOME_COMMON_INIT
 
-EPIPHANY_MAJOR=1.3
+EPIPHANY_MAJOR=1.4
 AC_SUBST(EPIPHANY_MAJOR)
 
 AM_CONFIG_HEADER(config.h)
@@ -165,7 +165,7 @@ AC_MSG_RESULT($MOZILLA_VERSION$autodetect)
 
 dnl Test for the "trunk" version
 if test $MOZILLA_VERSION = "trunk"; then
-	MOZILLA_VERSION=99.0 # use a high number
+	MOZILLA_VERSION=9.0 # use a high number
 fi
 
 dnl Split up the version string ( 1.7rc1 -> 1 7 rc 1 )