Add directory name resolution when the menu file and command line conflict, proper directory storage in the menu file, conversion for pre-1.16 files, and miscellaneous cleanup work.
Add directory name resolution when the menu file and command line conflict, proper directory storage in the menu file, conversion for pre-1.16 files, and miscellaneous cleanup work.


git-svn-id: 98898d48182945044bd4ba440757b4f5b6ba6d1c@283 6b081834-2649-4b4f-abbc-426aeab4333c

prantlf/NaturalDocs,prantlf/NaturalDocs,prantlf/NaturalDocs