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/design-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/design-data')
| -rw-r--r-- | libical/design-data/components.txt | 1 | ||||
| -rw-r--r-- | libical/design-data/prop-to-value.txt | 11 |
2 files changed, 10 insertions, 2 deletions
diff --git a/libical/design-data/components.txt b/libical/design-data/components.txt index 15417eaf2f..ae5cc976ad 100644 --- a/libical/design-data/components.txt +++ b/libical/design-data/components.txt @@ -17,5 +17,6 @@ VQUERY VCAR VCOMMAND XLICINVALID +XMIMEPART ANY diff --git a/libical/design-data/prop-to-value.txt b/libical/design-data/prop-to-value.txt index a06bdc31f1..4f4bf196ff 100644 --- a/libical/design-data/prop-to-value.txt +++ b/libical/design-data/prop-to-value.txt @@ -34,8 +34,7 @@ CREATED DATE-TIME DTSTAMP DATE-TIME LAST-MODIFIED DATE-TIME SEQUENCE INTEGER -X-LIC-ERROR TEXT -X-LIC-CLUSTERCOUNT INTEGER +X TEXT REQUEST-STATUS STRING ATTACH ATTACH # Non-std: URI or BINARY GEO GEO # Non-std: Two FLOATS @@ -48,3 +47,11 @@ RDATE DATE-TIME-PERIOD # Non-std: DATE-TIME or DATE or PERIOD TRIGGER TRIGGER # Non-std: DURATION or DATE-TIME DURATION DURATION QUERY QUERY +X-LIC-ERROR TEXT +X-LIC-CLUSTERCOUNT INTEGER +X-LIC-MIMECONTENTTYPE STRING +X-LIC-MIMECHARSET STRING +X-LIC-MIMEENCODING STRING +X-LIC-MIMEOPTINFO STRING +X-LIC-MIMECID STRING +X-LIC-MIMEFILENAME STRING |