diff options
| author | Federico Mena Quintero <federico@src.gnome.org> | 2000-12-12 08:27:42 +0800 |
|---|---|---|
| committer | Federico Mena Quintero <federico@src.gnome.org> | 2000-12-12 08:27:42 +0800 |
| commit | d7f57ad7fed3c4ec76ccbe8da642569711017ba5 (patch) | |
| tree | d1826737b6dd62f0ed7394f9a2a35dae8d7a8273 /libical/src/test | |
| parent | 96cf97e4de2bc0ecf75f973e6dad34f7e08a6995 (diff) | |
| download | gsoc2013-evolution-d7f57ad7fed3c4ec76ccbe8da642569711017ba5.tar gsoc2013-evolution-d7f57ad7fed3c4ec76ccbe8da642569711017ba5.tar.gz gsoc2013-evolution-d7f57ad7fed3c4ec76ccbe8da642569711017ba5.tar.bz2 gsoc2013-evolution-d7f57ad7fed3c4ec76ccbe8da642569711017ba5.tar.lz gsoc2013-evolution-d7f57ad7fed3c4ec76ccbe8da642569711017ba5.tar.xz gsoc2013-evolution-d7f57ad7fed3c4ec76ccbe8da642569711017ba5.tar.zst gsoc2013-evolution-d7f57ad7fed3c4ec76ccbe8da642569711017ba5.zip | |
Fix fucking CVS conflicts - Federico
svn path=/trunk/; revision=6928
Diffstat (limited to 'libical/src/test')
| -rw-r--r-- | libical/src/test/copycluster.c | 1 | ||||
| -rw-r--r-- | libical/src/test/regression.c | 1 | ||||
| -rw-r--r-- | libical/src/test/storage.c | 1 | ||||
| -rw-r--r-- | libical/src/test/stow.c | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/libical/src/test/copycluster.c b/libical/src/test/copycluster.c index 0d6722fc94..11e648d861 100644 --- a/libical/src/test/copycluster.c +++ b/libical/src/test/copycluster.c @@ -4,6 +4,7 @@ CREATOR: eric 15 January 2000 $Id$ + $Locker$ (C) COPYRIGHT 2000 Eric Busboom http://www.softwarestudio.org diff --git a/libical/src/test/regression.c b/libical/src/test/regression.c index 1d66ee4fc5..b14e8aa6f8 100644 --- a/libical/src/test/regression.c +++ b/libical/src/test/regression.c @@ -6,6 +6,7 @@ DESCRIPTION: $Id$ + $Locker$ (C) COPYRIGHT 1999 Eric Busboom http://www.softwarestudio.org diff --git a/libical/src/test/storage.c b/libical/src/test/storage.c index b8eb48c30f..8251babefe 100644 --- a/libical/src/test/storage.c +++ b/libical/src/test/storage.c @@ -6,6 +6,7 @@ DESCRIPTION: $Id$ + $Locker$ (C) COPYRIGHT 1999 Eric Busboom http://www.softwarestudio.org diff --git a/libical/src/test/stow.c b/libical/src/test/stow.c index 6c285afc77..a305d161fe 100644 --- a/libical/src/test/stow.c +++ b/libical/src/test/stow.c @@ -4,6 +4,7 @@ CREATOR: eric 29 April 2000 $Id$ + $Locker$ (C) COPYRIGHT 2000 Eric Busboom http://www.softwarestudio.org |