Merge branch 'log-window-webview'
authorDanielle Madeley <danielle.madeley@collabora.co.uk>
Thu, 18 Aug 2011 00:10:00 +0000 (10:10 +1000)
committerDanielle Madeley <danielle.madeley@collabora.co.uk>
Thu, 18 Aug 2011 00:10:00 +0000 (10:10 +1000)
commit2021c145e0c5eb6aa9eda91d58d54b13007113ad
treeab6b5ba09764a785e8c06efae2f69dca111089be
parentd3e8563fe9b3d3c0b5ee5f225964b8078e18d1e6
parentdc7080f5071a9130bbd9288b50f807b41a5f9864
Merge branch 'log-window-webview'
configure.ac
data/empathy-log-window.html
libempathy-gtk/Makefile.am
libempathy-gtk/empathy-log-window.c
libempathy/empathy-gsettings.h
src/Makefile.am
src/empathy-preferences.c