]> git.0d.be Git - empathy.git/commit
Merge branch 'sms-support-rebase'
authorDanielle Madeley <danielle.madeley@collabora.co.uk>
Thu, 5 May 2011 07:37:40 +0000 (17:37 +1000)
committerDanielle Madeley <danielle.madeley@collabora.co.uk>
Thu, 5 May 2011 07:37:40 +0000 (17:37 +1000)
commit9a1a49ed9ddf5a3d1da99eabca27882705688545
tree5626cc6bb9aa534c4734de4fe76caf82d42f72a4
parent77fab8ebc60ce2625c4f449cde6296b25b10b05d
parent0fda59487b536e49bfcec7ab1ee6e9c6d7b6f306
Merge branch 'sms-support-rebase'
src/empathy-chat-manager.c
src/empathy-chat-window.c