diff options
author | Kristian Høgsberg <krh@redhat.com> | 2005-02-07 10:15:46 +0000 |
---|---|---|
committer | Kristian Høgsberg <krh@redhat.com> | 2005-02-07 10:15:46 +0000 |
commit | 0c07ddf729f0b4d2625dec90fbec6321f4908424 (patch) | |
tree | 87d7f86a39eaab08534146d44a1441d87ad9209d /AUTHORS | |
parent | 7296349eaa23f2e697e5553d7a1fd0b818aad47f (diff) | |
download | cairo-0c07ddf729f0b4d2625dec90fbec6321f4908424.tar.gz |
Argh, committed conflict marker in ChangeLog - fixed.
Diffstat (limited to 'AUTHORS')
0 files changed, 0 insertions, 0 deletions