diff options
| author | Allen Winter <allen.winter@kdab.com> | 2018-02-23 10:01:58 -0500 |
|---|---|---|
| committer | Allen Winter <allen.winter@kdab.com> | 2018-02-23 10:01:58 -0500 |
| commit | a9f781d9b5a2861c38e2b25df949f3fc3ee784c4 (patch) | |
| tree | 79761654a195be0272282d86bb7df2e71ad8d99c | |
| parent | 47668c03b5c050a690142f9bfe175601cec6daee (diff) | |
| parent | 19fd55456d04a53e622872e2d0e3c2402bce85e4 (diff) | |
| download | libical-git-a9f781d9b5a2861c38e2b25df949f3fc3ee784c4.tar.gz | |
Merge branch '3.0'
| -rw-r--r-- | design-data/properties.csv | 2 | ||||
| -rw-r--r-- | doc/reference/libical-glib/libical-glib-docs.xml.in | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/design-data/properties.csv b/design-data/properties.csv index cb0eeb36..7e36ded7 100644 --- a/design-data/properties.csv +++ b/design-data/properties.csv @@ -17,7 +17,7 @@ "RESOURCES","71","TEXT","TEXT",is_multivalued "STATUS","76","STATUS","STATUS" "SUMMARY","78","TEXT","TEXT" -"COMPLETED","16","DATE-TIME","DATE-TIME" +"COMPLETED","16","DATE-TIME-DATE","DATE-TIME" "DTEND","30","DATE-TIME-DATE","DATE-TIME" "DUE","33","DATE-TIME-DATE","DATE-TIME" "DTSTART","32","DATE-TIME-DATE","DATE-TIME" diff --git a/doc/reference/libical-glib/libical-glib-docs.xml.in b/doc/reference/libical-glib/libical-glib-docs.xml.in index 483d1708..b202e198 100644 --- a/doc/reference/libical-glib/libical-glib-docs.xml.in +++ b/doc/reference/libical-glib/libical-glib-docs.xml.in @@ -60,18 +60,18 @@ <title>API Index</title> <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include> </index> - <!--<index id="api-index-3.0" role="3.0"> + <index id="api-index-3-0" role="3.0"> <title>Index of new symbols in 3.0</title> <xi:include href="xml/api-index-3.0.xml"><xi:fallback /></xi:include> - </index>--> - <!--<index id="api-index-2.0" role="2.0"> + </index> + <index id="api-index-2-0" role="2.0"> <title>Index of new symbols in 2.0</title> <xi:include href="xml/api-index-2.0.xml"><xi:fallback /></xi:include> - </index>--> - <!--<index id="api-index-1.0" role="1.0"> + </index> + <index id="api-index-1-0" role="1.0"> <title>Index of new symbols in 1.0</title> <xi:include href="xml/api-index-1.0.xml"><xi:fallback /></xi:include> - </index>--> + </index> <!--<index id="deprecated-api-index" role="deprecated"> <title>Index of deprecated API</title> <xi:include href="xml/api-index-deprecated.xml"><xi:fallback /></xi:include> |