resolved some conflicts, added CommandLine
[sbp.git] / doc / jargon.txt
2005-12-12 adaminitial import