[empathy: 7/7] Merge branch 'gnome-3-4'
- From: Guillaume Desmottes <gdesmott src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy: 7/7] Merge branch 'gnome-3-4'
- Date: Mon, 16 Apr 2012 12:00:59 +0000 (UTC)
commit 6094f6b6b5c56f50ffa65849537b310615498c1b
Merge: a26a516 a04eca8
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date: Mon Apr 16 14:00:41 2012 +0200
Merge branch 'gnome-3-4'
Conflicts:
configure.ac
po/sk.po
po/zh_CN.po
NEWS | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]