git.0d.be Git - empathy.git/commit

]> git.0d.be Git - empathy.git/commit

projects / empathy.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: b50b703 6df1c4b)

author	Sjoerd Simons <sjoerd.simons@collabora.co.uk>
	Tue, 28 Jul 2009 09:20:27 +0000 (11:20 +0200)
committer	Sjoerd Simons <sjoerd.simons@collabora.co.uk>
	Tue, 28 Jul 2009 09:20:27 +0000 (11:20 +0200)
commit	1d153c1cf91edce537bc64efb01b5a496b35518e
tree	de8ba4359a0341bd0c8c6e1a7495f4f39fb565f1	tree \| snapshot
parent	b50b7039d3b52f33df94e5a3526d9f43a51401ad	commit \| diff
parent	6df1c4bdd81fbbb288b8e49c3bea9a1dd2e005a6	commit \| diff

Merge commit 'upstream/master' into mc5

Conflicts:
libempathy-gtk/empathy-account-widget.c
src/empathy.c

17 files changed:

configure.ac	diff1 \|	diff2 \|	blob \| history
libempathy-gtk/Makefile.am	diff1 \|	diff2 \|	blob \| history
libempathy-gtk/empathy-account-chooser.c	diff1 \|	diff2 \|	blob \| history
libempathy-gtk/empathy-account-widget-irc.c	diff1 \|	diff2 \|	blob \| history
libempathy-gtk/empathy-contact-dialogs.c	diff1 \|	diff2 \|	blob \| history
libempathy-gtk/empathy-theme-adium.c	diff1 \|	diff2 \|	blob \| history
libempathy-gtk/empathy-ui-utils.c	diff1 \|	diff2 \|	blob \| history
libempathy/empathy-chatroom-manager.c	diff1 \|	diff2 \|	blob \| history
libempathy/empathy-log-store-empathy.c	diff1 \|	diff2 \|	blob \| history
libempathy/empathy-tp-chat.c	diff1 \|	diff2 \|	blob \| history
libempathy/empathy-tp-contact-list.c	diff1 \|	diff2 \|	blob \| history
megaphone/src/megaphone-applet.c	diff1 \|	diff2 \|	blob \| history
src/empathy-accounts-dialog.ui	diff1 \|	diff2 \|	blob \| history
src/empathy-chat-window.c	diff1 \|	diff2 \|	blob \| history
src/empathy-debug-dialog.c	diff1 \|	diff2 \|	blob \| history
src/empathy-main-window.c	diff1 \|	diff2 \|	blob \| history
src/empathy.c	diff1 \|	diff2 \|	blob \| history

Fork of git.gnome.org/browse/empathy (was not supposed to be merged)