diff options
author | Jeffrey Stedfast <fejj@src.gnome.org> | 2002-09-19 10:38:20 +0800 |
---|---|---|
committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2002-09-19 10:38:20 +0800 |
commit | 7fea78c3c1d4d6649599ccdf1cd3c5929ae370a8 (patch) | |
tree | c43709aba9db1be3fd613dcd4977cccc5578be31 /acconfig.h | |
parent | 13c01546e5deccb285f37118e29744d8dc6f07b4 (diff) | |
download | gsoc2013-evolution-7fea78c3c1d4d6649599ccdf1cd3c5929ae370a8.tar gsoc2013-evolution-7fea78c3c1d4d6649599ccdf1cd3c5929ae370a8.tar.gz gsoc2013-evolution-7fea78c3c1d4d6649599ccdf1cd3c5929ae370a8.tar.bz2 gsoc2013-evolution-7fea78c3c1d4d6649599ccdf1cd3c5929ae370a8.tar.lz gsoc2013-evolution-7fea78c3c1d4d6649599ccdf1cd3c5929ae370a8.tar.xz gsoc2013-evolution-7fea78c3c1d4d6649599ccdf1cd3c5929ae370a8.tar.zst gsoc2013-evolution-7fea78c3c1d4d6649599ccdf1cd3c5929ae370a8.zip |
fixed a merge conflict
svn path=/trunk/; revision=18109
Diffstat (limited to 'acconfig.h')
0 files changed, 0 insertions, 0 deletions