]> git.0d.be Git - empathy.git/commitdiff
projects / empathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 138123c ec619f9)
Merge branch 'gnome-3-8'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Fri, 24 May 2013 14:00:49 +0000 (16:00 +0200)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Fri, 24 May 2013 14:00:49 +0000 (16:00 +0200)
Conflicts:
NEWS
configure.ac

1  2 
libempathy-gtk/empathy-log-window.c patch | diff1 | diff2 | blob | history
src/empathy-debug-window.c patch | diff1 | diff2 | blob | history
src/empathy-new-chatroom-dialog.c patch | diff1 | diff2 | blob | history

diff --cc libempathy-gtk/empathy-log-window.c
Simple merge
diff --cc src/empathy-debug-window.c
Simple merge
diff --cc src/empathy-new-chatroom-dialog.c
Simple merge
Fork of git.gnome.org/browse/empathy (was not supposed to be merged)