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)
1  2 
src/Makefile.am
src/empathy.c

diff --cc src/Makefile.am
Simple merge
diff --cc src/empathy.c
Simple merge