JP Rosevear 73a6d43a66 Fix minor conflicts. ...

svn path=/trunk/; revision=5017

2000-08-24 20:12:06 +00:00

..

.cvsignore

…

components.txt

Fix minor conflicts.

2000-08-24 20:12:06 +00:00

Makefile.am

…

param-c-types.txt

…

params-in-prop.txt

…

prop-to-value.txt

Fix minor conflicts.

2000-08-24 20:12:06 +00:00

property-tokens.txt

…

restrictions.csv

…

status-new.txt

…

status.foo

…

status.txt

…

value-c-types.txt

…

value-mem-semantics.txt

…