]> git.0d.be Git - empathy.git/commit - tests/test-helper.c
projects / empathy.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 078aa4b 0b86e86)
Merge branch 'adium-events'
authorXavier Claessens <xclaesse@gmail.com>
Thu, 26 Nov 2009 09:20:40 +0000 (10:20 +0100)
committerXavier Claessens <xclaesse@gmail.com>
Thu, 26 Nov 2009 09:20:40 +0000 (10:20 +0100)
commit9ff14672ab605f20789a2db6f9f89673cf8f2c4b
tree19abe13769981d82500d44e7e88b1bb7de0c5ccctree | snapshot
parent078aa4b28cbca7e5a77701fcbcaf0237e6e717abcommit | diff
parent0b86e861b20e3c083baa04bb9e0fa2df31df8e8dcommit | diff
Merge branch 'adium-events'

Conflicts:
libempathy-gtk/empathy-theme-adium.c
libempathy-gtk/empathy-theme-adium.c diff1 | diff2 | blob | history
Fork of git.gnome.org/browse/empathy (was not supposed to be merged)