diff options
author | Jeffrey Stedfast <fejj@src.gnome.org> | 2004-04-28 02:39:40 +0800 |
---|---|---|
committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2004-04-28 02:39:40 +0800 |
commit | 342bde963e6a4e29ddb6d9f288a521391daf0fd3 (patch) | |
tree | 558bb616e277b5a0cb5020ea4f5bf8f4688d2822 /calendar | |
parent | 18a3cac18aeaca1f34268a5e022c8d255b4fa70f (diff) | |
download | gsoc2013-evolution-342bde963e6a4e29ddb6d9f288a521391daf0fd3.tar.gz gsoc2013-evolution-342bde963e6a4e29ddb6d9f288a521391daf0fd3.tar.zst gsoc2013-evolution-342bde963e6a4e29ddb6d9f288a521391daf0fd3.zip |
fixed merge conflicts
svn path=/trunk/; revision=25637
Diffstat (limited to 'calendar')
0 files changed, 0 insertions, 0 deletions