diff options
| author | Cosimo Cecchi <cosimoc@gnome.org> | 2009-06-02 00:02:03 +0800 |
|---|---|---|
| committer | Cosimo Cecchi <cosimoc@gnome.org> | 2009-06-02 00:02:03 +0800 |
| commit | 17fec9762e1680828a73efb59f7ed155219763ac (patch) | |
| tree | a1ebe2d3f0a050e98b1c81ecf9dcf0d727d4b8ec /libempathy/empathy-status-presets.h | |
| parent | f0c1f00b3562294709827d1463b3d605e0f09f40 (diff) | |
| download | gsoc2013-empathy-17fec9762e1680828a73efb59f7ed155219763ac.tar gsoc2013-empathy-17fec9762e1680828a73efb59f7ed155219763ac.tar.gz gsoc2013-empathy-17fec9762e1680828a73efb59f7ed155219763ac.tar.bz2 gsoc2013-empathy-17fec9762e1680828a73efb59f7ed155219763ac.tar.lz gsoc2013-empathy-17fec9762e1680828a73efb59f7ed155219763ac.tar.xz gsoc2013-empathy-17fec9762e1680828a73efb59f7ed155219763ac.tar.zst gsoc2013-empathy-17fec9762e1680828a73efb59f7ed155219763ac.zip | |
Fix conflict after rebase
Diffstat (limited to 'libempathy/empathy-status-presets.h')
0 files changed, 0 insertions, 0 deletions