fix bug in commit 14694

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14696 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Revert 14616, 14617.  Go back to the original syntax for toplevel directives, only allowing capitalized identifiers in addition to lowercase ones.  Split #show into variants #show_val, #show_type, etc,  and implement a generic #show which combines all the results.

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14697 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Document that the new alternative syntax for string literals can break comments.

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14698 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Fix PR#6383: Exception Not_found when using object type in absent module

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14701 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
merge Leo's patch for PR#6384

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14702 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
update Makefile.nt for new asmcomp modules

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14703 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Wrong MASM syntax, try again.


git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14704 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
merge branch "safe-string"

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14705 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Merge branch 'trunk' into open_types

Conflicts:
	boot/ocamlc
	boot/ocamldep
	boot/ocamllex
	toplevel/topdirs.ml
	typing/parmatch.ml
	typing/predef.ml
	typing/predef.mli
Bootstrap
Fix merge errors