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)
commit5d6902cc05f95832e06afd88b6d581be68c1a79f
tree07b3c98b86de4b24e82fb52990f24716e9b0411a
parent62a0fee5ae1749f38e476ba67c0e1f2804ad5ee7
parentd8dd568c2c1fed4cb328c2a9afc148186fda12aa
Merge branch 'undo-close-tab'
src/Makefile.am
src/empathy-chat-window.c
src/empathy-chat-window.ui
src/empathy-main-window.c
src/empathy.c