diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2013-10-03 14:16:49 +0200 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2013-10-03 14:16:49 +0200 |
| commit | c6b2511c0d608faa79fae3f74efad0cecffd55ba (patch) | |
| tree | 6ed0d042dce3ba3be6cf2a334330e5569d67f2e4 | |
| parent | 0a3f85fad87ccbec4d21af1b3b15491449554ea8 (diff) | |
| parent | dc7568986824c07cd841d002ef7f15f65a16846a (diff) | |
| download | telepathy-idle-c6b2511c0d608faa79fae3f74efad0cecffd55ba.tar.gz | |
Merge branch 'telepathy-idle-0.2'
Conflicts:
configure.ac
| -rw-r--r-- | NEWS | 7 | ||||
| -rw-r--r-- | configure.ac | 4 |
2 files changed, 9 insertions, 2 deletions
@@ -1,3 +1,10 @@ +telepathy-idle 0.2.0 (2013-10-03) +================================= + +This is a new stable branch, recommended for GNOME 3.10-based distributions. + +No code changes since 0.1.17. + telepathy-idle 0.1.17 (2013-09-18) ================================== diff --git a/configure.ac b/configure.ac index bce3531..54ce94c 100644 --- a/configure.ac +++ b/configure.ac @@ -10,8 +10,8 @@ AC_PREREQ([2.59]) # set nano_version to 1 m4_define([idle_major_version], [0]) -m4_define([idle_minor_version], [1]) -m4_define([idle_micro_version], [17]) +m4_define([idle_minor_version], [2]) +m4_define([idle_micro_version], [0]) m4_define([idle_nano_version], [1]) m4_define([idle_base_version], |