aboutsummaryrefslogtreecommitdiffstats
path: root/src/empathy-status-icon.h
diff options
context:
space:
mode:
authorXavier Claessens <xclaesse@gmail.com>2009-11-26 17:20:40 +0800
committerXavier Claessens <xclaesse@gmail.com>2009-11-26 17:20:40 +0800
commit9ff14672ab605f20789a2db6f9f89673cf8f2c4b (patch)
tree19abe13769981d82500d44e7e88b1bb7de0c5ccc /src/empathy-status-icon.h
parent078aa4b28cbca7e5a77701fcbcaf0237e6e717ab (diff)
parent0b86e861b20e3c083baa04bb9e0fa2df31df8e8d (diff)
downloadgsoc2013-empathy-9ff14672ab605f20789a2db6f9f89673cf8f2c4b.tar
gsoc2013-empathy-9ff14672ab605f20789a2db6f9f89673cf8f2c4b.tar.gz
gsoc2013-empathy-9ff14672ab605f20789a2db6f9f89673cf8f2c4b.tar.bz2
gsoc2013-empathy-9ff14672ab605f20789a2db6f9f89673cf8f2c4b.tar.lz
gsoc2013-empathy-9ff14672ab605f20789a2db6f9f89673cf8f2c4b.tar.xz
gsoc2013-empathy-9ff14672ab605f20789a2db6f9f89673cf8f2c4b.tar.zst
gsoc2013-empathy-9ff14672ab605f20789a2db6f9f89673cf8f2c4b.zip
Merge branch 'adium-events'
Conflicts: libempathy-gtk/empathy-theme-adium.c
Diffstat (limited to 'src/empathy-status-icon.h')
0 files changed, 0 insertions, 0 deletions