]> git.0d.be Git - empathy.git/commitdiff
projects / empathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 105cc83)
Merge branch 'slatez-applets'
authorJonny Lamb <jonnylamb@gnome.org>
Tue, 20 Oct 2009 13:00:51 +0000 (14:00 +0100)
committerJonny Lamb <jonnylamb@gnome.org>
Tue, 20 Oct 2009 13:00:51 +0000 (14:00 +0100)
Conflicts:
Makefile.am
configure.ac

Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

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