diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-10-02 18:54:22 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-10-02 18:54:22 +0100 |
| commit | 5966614f02396af328e198238f0f8753856b7cca (patch) | |
| tree | 1228993f72c29f84114a14d3d96d9a1913776343 | |
| parent | 67962999682484316fd568dfc685fcd500c34f92 (diff) | |
| parent | c2e69c96cffd6a82c16ab11d8fd3f660a9fd4d85 (diff) | |
Merge branch 'telepathy-rakia-0.8' and bump version to 0.8.99
Conflicts:
NEWS
configure.ac
| -rw-r--r-- | NEWS | 12 | ||||
| -rw-r--r-- | configure.ac | 4 |
2 files changed, 12 insertions, 4 deletions
@@ -7,10 +7,18 @@ formerly known as Telepathy-SofiaSIP (most recent at the top). See also ChangeLog. -telepathy-rakia 0.7.6 (UNRELEASED) +telepathy-rakia 0.9.0 (UNRELEASED) ---------------------------------- -… +... + +telepathy-rakia 0.8.0 (2013-10-02) +---------------------------------- + +The “Origin” release. This is a new stable branch, recommended for +GNOME 3.10-based distributions. + +No code changes since 0.7.5. telepathy-rakia 0.7.5 (2013-09-10) ---------------------------------- diff --git a/configure.ac b/configure.ac index 4a6b336..5e67436 100644 --- a/configure.ac +++ b/configure.ac @@ -2,8 +2,8 @@ AC_PREREQ([2.60]) m4_define([THIS_PACKAGE],[telepathy-rakia]) m4_define([VERSION_MAJOR],[0]) -m4_define([VERSION_MINOR],[7]) -m4_define([VERSION_MICRO],[5]) +m4_define([VERSION_MINOR],[8]) +m4_define([VERSION_MICRO],[99]) m4_define([VERSION_NANO],[1]) m4_define([BASE_VERSION],[VERSION_MAJOR.VERSION_MINOR.VERSION_MICRO]) |