aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXan Lopez <xlopez@igalia.com>2011-10-27 02:25:24 +0800
committerXan Lopez <xlopez@igalia.com>2011-10-27 02:25:24 +0800
commit0f9f250d9857a78c4e4bd84178d48b371b49c823 (patch)
tree4e2407ca996d038e009e7d4477dd3d95f38486f1
parent9df11fbf4cf7cbfbe7ebfb4f382997b90cf14c59 (diff)
downloadgsoc2013-epiphany-0f9f250d9857a78c4e4bd84178d48b371b49c823.tar
gsoc2013-epiphany-0f9f250d9857a78c4e4bd84178d48b371b49c823.tar.gz
gsoc2013-epiphany-0f9f250d9857a78c4e4bd84178d48b371b49c823.tar.bz2
gsoc2013-epiphany-0f9f250d9857a78c4e4bd84178d48b371b49c823.tar.lz
gsoc2013-epiphany-0f9f250d9857a78c4e4bd84178d48b371b49c823.tar.xz
gsoc2013-epiphany-0f9f250d9857a78c4e4bd84178d48b371b49c823.tar.zst
gsoc2013-epiphany-0f9f250d9857a78c4e4bd84178d48b371b49c823.zip
[release] 3.3.13.3.1
-rw-r--r--NEWS10
-rw-r--r--configure.ac8
2 files changed, 14 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index 99829ed00..195eecae4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,14 @@
==============
+Epiphany 3.3.1
+==============
+
+Changes:
+
+ - Don't crash when NetworkManager is not available (#659103)
+ - Fix markup in in dialog string (#660749)
+ - Port from GtkTable to GtkGrid (#661347)
+
+==============
Epiphany 3.2.0
==============
diff --git a/configure.ac b/configure.ac
index ff21bf9e5..39d35e5d0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,8 +16,8 @@
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
m4_define([epiphany_version_major],[3])
-m4_define([epiphany_version_minor],[2])
-m4_define([epiphany_version_micro],[0])
+m4_define([epiphany_version_minor],[3])
+m4_define([epiphany_version_micro],[1])
m4_define([epiphany_version],[epiphany_version_major.epiphany_version_minor.epiphany_version_micro])
# This can be either "trunk" or "branches/gnome-x-y"
@@ -31,10 +31,10 @@ AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_SRCDIR([configure.ac])
-EPIPHANY_API_VERSION=3.2
+EPIPHANY_API_VERSION=3.3
# This should stay at the major version of the latest stable releases
-EPIPHANY_UA_VERSION=3.2
+EPIPHANY_UA_VERSION=3.3
AC_SUBST([EPIPHANY_MAJOR],[epiphany_version_major.epiphany_version_minor])
AC_SUBST([EPIPHANY_API_VERSION])