From: Danielle Madeley Date: Thu, 18 Aug 2011 00:10:00 +0000 (+1000) Subject: Merge branch 'log-window-webview' X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=2021c145e0c5eb6aa9eda91d58d54b13007113ad Merge branch 'log-window-webview' --- 2021c145e0c5eb6aa9eda91d58d54b13007113ad diff --cc configure.ac index d8de67f2,7f6ec16d..3aa266b9 --- a/configure.ac +++ b/configure.ac @@@ -179,8 -174,7 +179,9 @@@ PKG_CHECK_MODULES(EMPATHY libcanberra-gtk3 >= $LIBCANBERRA_GTK_REQUIRED libnotify >= $LIBNOTIFY_REQUIRED gcr-3 >= $GCR_REQUIRED + libpulse + libpulse-mainloop-glib + webkitgtk-3.0 >= $WEBKIT_REQUIRED ]) PKG_CHECK_MODULES(YELL, [telepathy-yell]) diff --cc data/empathy-log-window.html index 00000000,6962528a..88159252 mode 000000,100644..100644 --- a/data/empathy-log-window.html +++ b/data/empathy-log-window.html @@@ -1,0 -1,296 +1,296 @@@ + + + + + + + + +

+ +