[empathy: 6/6] Merge branch 'gnome-3-4'



commit 02ff77d1d5f3545dae75e91fe776930b941e7b08
Merge: 7e7a112 0d03cd1
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Mon Apr 2 11:08:17 2012 +0200

    Merge branch 'gnome-3-4'

 goa-mc-plugin/Makefile.am               |    3 +-
 goa-mc-plugin/mcp-account-manager-goa.c |   42 ++++++++++++++-----------------
 2 files changed, 21 insertions(+), 24 deletions(-)
---



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]