Merge branch 'gnome-3-4'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Wed, 9 May 2012 12:02:13 +0000 (14:02 +0200)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Wed, 9 May 2012 12:02:13 +0000 (14:02 +0200)
Conflicts:
configure.ac
libempathy/empathy-tp-chat.c
src/empathy-event-manager.c
src/empathy-streamed-media-window.c
src/empathy-video-widget.c

1  2 
configure.ac

diff --cc configure.ac
@@@ -58,10 -62,9 +62,9 @@@ GCR_REQUIRED=2.91.
  LIBCANBERRA_GTK_REQUIRED=0.25
  LIBNOTIFY_REQUIRED=0.7.0
  TELEPATHY_FARSTREAM_REQUIRED=0.2.1
- TELEPATHY_GLIB_REQUIRED=0.17.6
  TELEPATHY_LOGGER=0.2.13
  WEBKIT_REQUIRED=1.3.13
 -GOA_REQUIRED=3.3.0
 +GOA_REQUIRED=3.5.1
  
  # Optional deps
  ENCHANT_REQUIRED=1.2.0