add XGetopt.h
clean up some lint
Add svn changes to date
cf
conflicts
delta 1