]> git.0d.be Git - empathy.git/commitdiff
projects / empathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4a5169b c51c43f)
Merge branch 'LOLOOOLOLOLOLLLOLLLOLOLLL'
authorJonny Lamb <jonnylamb@gnome.org>
Wed, 18 May 2011 14:23:15 +0000 (15:23 +0100)
committerJonny Lamb <jonnylamb@gnome.org>
Wed, 18 May 2011 14:23:15 +0000 (15:23 +0100)
1  2 
src/empathy-chat-window.c patch | diff1 | diff2 | blob | history

diff --cc src/empathy-chat-window.c
Simple merge
Fork of git.gnome.org/browse/empathy (was not supposed to be merged)