]> git.0d.be Git - empathy.git/commit
Merge remote branch 'vminko/fix-632024-v2'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 18 Oct 2010 13:22:46 +0000 (15:22 +0200)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 18 Oct 2010 13:22:46 +0000 (15:22 +0200)
commit0446279dbf79a85718ca7a71bb6588d389ed15f5
tree5cca1866f7b2b40debd0e480bc6e99d632a8721a
parentd91cd1d110fa660385574d3a9128b83287fc9a92
parentb3a5b441b884c25198b77ae014cde3b73d396257
Merge remote branch 'vminko/fix-632024-v2'
libempathy-gtk/empathy-individual-view.c
libempathy-gtk/empathy-individual-view.h
src/empathy-main-window.c