aboutsummaryrefslogtreecommitdiffstats
path: root/libical/design-data/prop-to-value.txt
diff options
context:
space:
mode:
authorFederico Mena Quintero <federico@src.gnome.org>2000-12-12 07:01:26 +0800
committerFederico Mena Quintero <federico@src.gnome.org>2000-12-12 07:01:26 +0800
commit26eee7328031f78b063ab71265ef4fddc8619c72 (patch)
tree65334073d42b48a4c23f2d7d20a6813c2113f57c /libical/design-data/prop-to-value.txt
parent5ccacd6a5bbeb2d91aea706f37cc5f96ee3144fb (diff)
downloadgsoc2013-evolution-26eee7328031f78b063ab71265ef4fddc8619c72.tar
gsoc2013-evolution-26eee7328031f78b063ab71265ef4fddc8619c72.tar.gz
gsoc2013-evolution-26eee7328031f78b063ab71265ef4fddc8619c72.tar.bz2
gsoc2013-evolution-26eee7328031f78b063ab71265ef4fddc8619c72.tar.lz
gsoc2013-evolution-26eee7328031f78b063ab71265ef4fddc8619c72.tar.xz
gsoc2013-evolution-26eee7328031f78b063ab71265ef4fddc8619c72.tar.zst
gsoc2013-evolution-26eee7328031f78b063ab71265ef4fddc8619c72.zip
Fix fucking CVS conflicts because fucking CVS is a fucking big doofus - Federico
svn path=/trunk/; revision=6920
Diffstat (limited to 'libical/design-data/prop-to-value.txt')
-rw-r--r--libical/design-data/prop-to-value.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/libical/design-data/prop-to-value.txt b/libical/design-data/prop-to-value.txt
index 4f4bf196ff..d753007339 100644
--- a/libical/design-data/prop-to-value.txt
+++ b/libical/design-data/prop-to-value.txt
@@ -10,7 +10,7 @@ LOCATION TEXT
PERCENT-COMPLETE INTEGER
PRIORITY INTEGER
RESOURCES TEXT
-STATUS TEXT
+STATUS STATUS
SUMMARY TEXT
COMPLETED DATE-TIME
FREEBUSY PERIOD