Merge branch 'debugger'
authorJonny Lamb <jonny.lamb@collabora.co.uk>
Thu, 25 Jun 2009 17:52:48 +0000 (18:52 +0100)
committerJonny Lamb <jonny.lamb@collabora.co.uk>
Thu, 25 Jun 2009 17:52:48 +0000 (18:52 +0100)
commit2f64117b60d24ba5ad3f4bb1c41d4ea3a91f15a6
treeacad03b8b27cc28a68d0c0e3558fd6828277e3b2
parentaa9603b62dd1893eb3fdcd357397ba20c733da43
parent807b62250294666c0dccc27fbab03c1c782dd38b
Merge branch 'debugger'
src/Makefile.am
src/empathy.c