Merge branch 'undo-close-tab'
authorJonny Lamb <jonnylamb@gnome.org>
Tue, 30 Mar 2010 13:48:31 +0000 (14:48 +0100)
committerJonny Lamb <jonnylamb@gnome.org>
Tue, 30 Mar 2010 13:48:31 +0000 (14:48 +0100)
1  2 
src/Makefile.am
src/empathy-chat-window.c
src/empathy-chat-window.ui
src/empathy-main-window.c
src/empathy.c

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