diff options
| author | Xavier Claessens <xclaesse@gmail.com> | 2009-11-26 17:20:40 +0800 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2009-11-26 17:20:40 +0800 |
| commit | 9ff14672ab605f20789a2db6f9f89673cf8f2c4b (patch) | |
| tree | 19abe13769981d82500d44e7e88b1bb7de0c5ccc /src/empathy-import-mc4-accounts.c | |
| parent | 078aa4b28cbca7e5a77701fcbcaf0237e6e717ab (diff) | |
| parent | 0b86e861b20e3c083baa04bb9e0fa2df31df8e8d (diff) | |
| download | gsoc2013-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-import-mc4-accounts.c')
0 files changed, 0 insertions, 0 deletions