diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-04-11 17:09:08 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-04-11 17:09:52 +0800 |
| commit | bb1cf54832b5c3b29744407de9189cd63af9c3c2 (patch) | |
| tree | c6a9439cdabd11b577223f9f6ff5923e035a4a8c /configure.ac | |
| parent | b8e7e162b685196577a7fc7fd4b56c173e76c40e (diff) | |
| parent | 25a167b368cfa169810f4fc6c8d4b9c6adba8aef (diff) | |
| download | gsoc2013-empathy-bb1cf54832b5c3b29744407de9189cd63af9c3c2.tar gsoc2013-empathy-bb1cf54832b5c3b29744407de9189cd63af9c3c2.tar.gz gsoc2013-empathy-bb1cf54832b5c3b29744407de9189cd63af9c3c2.tar.bz2 gsoc2013-empathy-bb1cf54832b5c3b29744407de9189cd63af9c3c2.tar.lz gsoc2013-empathy-bb1cf54832b5c3b29744407de9189cd63af9c3c2.tar.xz gsoc2013-empathy-bb1cf54832b5c3b29744407de9189cd63af9c3c2.tar.zst gsoc2013-empathy-bb1cf54832b5c3b29744407de9189cd63af9c3c2.zip | |
Merge branch 'gnome-3-4'
Conflicts:
po/ca@valencia.po
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 40a731a2b..9aab250b6 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ m4_define(empathy_released, 0) m4_define([empathy_major_version], [3]) m4_define([empathy_minor_version], [5]) m4_define([empathy_micro_version], [0]) -m4_define([empathy_nano_version], [1]) +m4_define([empathy_nano_version], [0]) dnl Display the nano_version only if it's not '0' m4_define([empathy_base_version], |