Public Git Hosting - empathy.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 5af1142 374ef85)

commit	0242d77256a8455f8e042bd82e499bee58fbfa00
author	Xavier Claessens <xclaesse@gmail.com>
	Sun, 10 Feb 2008 19:15:03 +0000 (10 20:15 +0100)
committer	Xavier Claessens <xclaesse@gmail.com>
	Sun, 10 Feb 2008 19:15:03 +0000 (10 20:15 +0100)
tree	b159356b226c280d99d32e2d8773b4d46c63269c	tree \| snapshot (tar.gz zip)
parent	5af1142965e18c7bfa7ac9286aa54a466da4dc1a	commit \| diff
parent	374ef859079592419f4914c872c0c17b2aeea1a8	commit \| diff

Merge branch 'master' into ircGeneric

Conflicts:

libempathy-gtk/Makefile.am
libempathy-gtk/empathy-accounts-dialog.c
libempathy/Makefile.am

configure.ac	diff1 \|	diff2 \|	blob \| history
libempathy-gtk/Makefile.am	diff1 \|	diff2 \|	blob \| history
libempathy-gtk/empathy-accounts-dialog.c	diff1 \|	diff2 \|	blob \| history
libempathy/Makefile.am	diff1 \|	diff2 \|	blob \| history

Instant messaging client using Telepathy