]> git.0d.be Git - empathy.git/commitdiff
projects / empathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f94f23d 652acf5)
Merge branch 'debug-av-599166'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Wed, 14 Jul 2010 09:21:07 +0000 (11:21 +0200)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Wed, 14 Jul 2010 09:21:07 +0000 (11:21 +0200)
1  2 
configure.ac patch | diff1 | diff2 | blob | history

diff --cc configure.ac
Simple merge
Fork of git.gnome.org/browse/empathy (was not supposed to be merged)