diff options
author | JP Rosevear <jpr@src.gnome.org> | 2000-08-25 04:12:06 +0800 |
---|---|---|
committer | JP Rosevear <jpr@src.gnome.org> | 2000-08-25 04:12:06 +0800 |
commit | 73a6d43a66a828b09e2c1b5a483405e6e0b5fa6a (patch) | |
tree | 5be6b34646e168f530ae5cf818a19d5b4be1bd73 /libical/test-data | |
parent | 37471a4d5261636aea1a330ed2c42db9e665a9f9 (diff) | |
download | gsoc2013-evolution-73a6d43a66a828b09e2c1b5a483405e6e0b5fa6a.tar.gz gsoc2013-evolution-73a6d43a66a828b09e2c1b5a483405e6e0b5fa6a.tar.zst gsoc2013-evolution-73a6d43a66a828b09e2c1b5a483405e6e0b5fa6a.zip |
Fix minor conflicts.
svn path=/trunk/; revision=5017
Diffstat (limited to 'libical/test-data')
-rw-r--r-- | libical/test-data/Makefile.am | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/libical/test-data/Makefile.am b/libical/test-data/Makefile.am index bf2079606c..83a434b288 100644 --- a/libical/test-data/Makefile.am +++ b/libical/test-data/Makefile.am @@ -10,4 +10,11 @@ EXTRA_DIST = \ 5 \ 6 \ 7 \ -smallcluster.ics
\ No newline at end of file +smallcluster.ics \ +recur.txt \ +user-cal.vcf \ +complex-mime.txt \ +simple-mime.txt \ +stresstest.ics + + |