diff options
author | Martin Kretzschmar <martink@src.gnome.org> | 2005-07-02 15:08:14 (GMT) |
---|---|---|
committer | Martin Kretzschmar <martink@src.gnome.org> | 2005-07-02 15:08:14 (GMT) |
commit | 30ab21a355281cee3960062ab616ab8b4fa795ca (patch) | |
tree | 14de5332bcdfcc61b599d714b1f16e5342fdae8f /shell/ev-pixbuf-cache.c | |
parent | de3612f2a4b46b555edc50ca344a04bc3a8f7280 (diff) |
Removed conflict markers from ChangeLog
Diffstat (limited to 'shell/ev-pixbuf-cache.c')
0 files changed, 0 insertions, 0 deletions