diff options
author | Jeffrey Stedfast <fejj@src.gnome.org> | 2000-11-21 10:21:40 +0800 |
---|---|---|
committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2000-11-21 10:21:40 +0800 |
commit | 0f442b0884aa8ffc2043c73912232f01928924d2 (patch) | |
tree | 5ebc9104f9505d5f11ee613311a5bf9090525478 /camel/Makefile.am | |
parent | 2cf986c43b05072cdcacf05aef0c5ddd595c1f18 (diff) | |
download | gsoc2013-evolution-0f442b0884aa8ffc2043c73912232f01928924d2.tar.gz gsoc2013-evolution-0f442b0884aa8ffc2043c73912232f01928924d2.tar.zst gsoc2013-evolution-0f442b0884aa8ffc2043c73912232f01928924d2.zip |
fix changelog merge conflicts
svn path=/trunk/; revision=6622
Diffstat (limited to 'camel/Makefile.am')
0 files changed, 0 insertions, 0 deletions