]> git.0d.be Git - empathy.git/commitdiff
projects / empathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ba97570 40e0273)
Merge branch 'ft_ipv4'
authorCosimo Cecchi <cosimoc@gnome.org>
Fri, 12 Jun 2009 10:04:42 +0000 (12:04 +0200)
committerCosimo Cecchi <cosimoc@gnome.org>
Fri, 12 Jun 2009 10:04:42 +0000 (12:04 +0200)
1  2 
libempathy/empathy-tp-file.c patch | diff1 | diff2 | blob | history

diff --cc libempathy/empathy-tp-file.c
Simple merge
Fork of git.gnome.org/browse/empathy (was not supposed to be merged)