[empathy: 18/18] Merge branch 'move-video-preview-656268'



commit 80c90eb2c847fe095eca1f741a4cfa772ec388a8
Merge: d6be6c7 aeb15b7
Author: Emilio Pozuelo Monfort <emilio pozuelo collabora co uk>
Date:   Mon Aug 15 13:32:40 2011 +0100

    Merge branch 'move-video-preview-656268'

 src/empathy-call-window.c |  374 ++++++++++++++++++++++++++++++++++++++++++++-
 src/empathy-call.c        |    7 +
 2 files changed, 377 insertions(+), 4 deletions(-)
---



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