diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2013-05-03 20:19:23 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2013-05-03 20:19:23 +0800 |
| commit | c4a27edfc22b7edc1ea1d4b5dc325ed34a93eaed (patch) | |
| tree | 4064eef2e8386c40d8c8eccacb33705f23e7fab7 | |
| parent | eb3b3c918fdb99db70d539257e8a1723f280e821 (diff) | |
| parent | 63ded644beff3bb2501c3df640ca3af795b29e16 (diff) | |
| download | gsoc2013-empathy-c4a27edfc22b7edc1ea1d4b5dc325ed34a93eaed.tar gsoc2013-empathy-c4a27edfc22b7edc1ea1d4b5dc325ed34a93eaed.tar.gz gsoc2013-empathy-c4a27edfc22b7edc1ea1d4b5dc325ed34a93eaed.tar.bz2 gsoc2013-empathy-c4a27edfc22b7edc1ea1d4b5dc325ed34a93eaed.tar.lz gsoc2013-empathy-c4a27edfc22b7edc1ea1d4b5dc325ed34a93eaed.tar.xz gsoc2013-empathy-c4a27edfc22b7edc1ea1d4b5dc325ed34a93eaed.tar.zst gsoc2013-empathy-c4a27edfc22b7edc1ea1d4b5dc325ed34a93eaed.zip | |
Merge branch 'gnome-3-8'
Conflicts:
src/empathy.c
| -rw-r--r-- | NEWS | 18 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | libempathy/empathy-utils.c | 2 |
3 files changed, 21 insertions, 1 deletions
@@ -1,3 +1,21 @@ +NEW in 3.8.1 (15/04/2013) +============ +Bugs fixed: + - Fixed #696544, goa-mc-plugin: Fix deprecation warnings (Emanuele Aina) + - Fixed #696718, Cleanup unused and redundant #include directives (Emanuele Aina) + - Fixed #697076, Cleanup #includes, second round (Emanuele Aina) + - Fixed #697254, Launching Empathy -p opens both the preferences and the main window (Marco Trevisan (Treviño)) + +Translations: + - Updated crh Translation (Reşat SABIQ) + - Updated en_GB Translation (Bruce Cowan) + - Updated fi Translation (Ville-Pekka Vainio) + - Updated kn Translation (Shankar Prasad) + - Updated uk Translation (Daniel Korostil) + +Documentation translations: + - Updated de Documentation translation (Christian Kirbach) + NEW in 3.8.0 (25/03/2013) ============ Bugs fixed: diff --git a/configure.ac b/configure.ac index 919fb3e81..d4c07d0d0 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ m4_define(empathy_released, 0) m4_define([empathy_major_version], [3]) m4_define([empathy_minor_version], [8]) -m4_define([empathy_micro_version], [0]) +m4_define([empathy_micro_version], [1]) m4_define([empathy_nano_version], [0]) dnl Display the nano_version only if it's not '0' diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c index 55769ca40..0efe3a180 100644 --- a/libempathy/empathy-utils.c +++ b/libempathy/empathy-utils.c @@ -37,6 +37,8 @@ #include "empathy-presence-manager.h" #include "extensions.h" +#include <math.h> + #define DEBUG_FLAG EMPATHY_DEBUG_OTHER #include "empathy-debug.h" |