]> git.0d.be Git - empathy.git/commit
Merge branch 'glassrose-contact-blocking-rebase'
authorDanielle Madeley <danielle.madeley@collabora.co.uk>
Mon, 14 Mar 2011 01:58:00 +0000 (12:58 +1100)
committerDanielle Madeley <danielle.madeley@collabora.co.uk>
Mon, 14 Mar 2011 01:58:00 +0000 (12:58 +1100)
commit8e6a977d36aea1eb4b429ddee84cb9b4bc4142cd
tree5c1858c474144e0cd511fc6891e9d21ef978c5e3
parent2e3e5e8e732fbc2e4d3ed61892aefa09efabbfc2
parentc0eca0414ca529da3b083c099ec3031436420b00
Merge branch 'glassrose-contact-blocking-rebase'
src/empathy-main-window.c
src/empathy-main-window.ui