[empathy/next: 7/7] Merge branch 'master' into next



commit 60f0d13b699b2ba6ec0a48b8faa84ce3f3f9d099
Merge: bdf3e5a c4ebbe6
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Wed Feb 5 13:55:46 2014 +0100

    Merge branch 'master' into next

 .gitignore                 |    1 +
 INSTALL                    |    2 -
 src/empathy-debug-window.c |   52 ++++++++++++++++++++++++++++++++++++++-----
 3 files changed, 47 insertions(+), 8 deletions(-)
---


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