added what I did into features and bugs--tried to resolve cvs conflicts.

e7d8272f · Amos Latteier · 38d89b90 · e7d8272f
Commit e7d8272f authored Dec 04, 1998 by Amos Latteier
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

doc/CHANGES.txt doc/CHANGES.txt +0 -1

No files found.
--- a/doc/CHANGES.txt
+++ b/doc/CHANGES.txt
 Principia Changes
  Principia 1.4.0