Changes by: Aleksey Nogin (nogin at cs.caltech.edu)
Date: 2006-04-11 21:19:09 -0700 (Tue, 11 Apr 2006)
Revision: 9063
Log message:

      Merged revs 8922:9061 from the 0.9.6.x branch:
         svn merge -r 8922:9061 svn+ssh://svn.metaprl.org/svnroot/mojave/omake-branches/0.9.6.x
         with some hand-editing.
      
      Still need to merge:
         - 0.9.6.shell changes 8877:9048 (this intentionally skips 9049, which
           merged .x into .shell)
         - 0.9.8.x changes 9051:... 
      

Changes  Path
+6 -0 omake-branches/omake_0_9_7_ref/CHANGELOG.txt
+39 -1 omake-branches/omake_0_9_7_ref/doc/html/changelog.html
+25 -15 omake-branches/omake_0_9_7_ref/doc/html/download.html
+233 -230 omake-branches/omake_0_9_7_ref/doc/html/omake-base.html
+604 -514 omake-branches/omake_0_9_7_ref/doc/html/omake-doc.html
+19 -2 omake-branches/omake_0_9_7_ref/doc/html/omake-language.html
+2 -2 omake-branches/omake_0_9_7_ref/doc/html/omake-options.html
+2 -2 omake-branches/omake_0_9_7_ref/doc/html/omake-pervasives.html
+2 -2 omake-branches/omake_0_9_7_ref/doc/html/omake-quickstart.html
+125 -68 omake-branches/omake_0_9_7_ref/doc/html/omake-root.html
+2 -2 omake-branches/omake_0_9_7_ref/doc/html/omake-rules.html
+2 -2 omake-branches/omake_0_9_7_ref/doc/html/omake-shell.html
+2 -2 omake-branches/omake_0_9_7_ref/doc/html/omake-system.html
+2 -2 omake-branches/omake_0_9_7_ref/doc/html/omake.html
+2 -2 omake-branches/omake_0_9_7_ref/doc/html/osh.html
+1 -1 omake-branches/omake_0_9_7_ref/doc/man/omake-base.1
+200 -144 omake-branches/omake_0_9_7_ref/doc/man/omake-base.txt
+55 -1 omake-branches/omake_0_9_7_ref/doc/man/omake-doc.1
+348 -216 omake-branches/omake_0_9_7_ref/doc/man/omake-doc.txt
+1 -1 omake-branches/omake_0_9_7_ref/doc/man/omake-language.1
+26 -12 omake-branches/omake_0_9_7_ref/doc/man/omake-language.txt
+1 -1 omake-branches/omake_0_9_7_ref/doc/man/omake-options.1
+10 -10 omake-branches/omake_0_9_7_ref/doc/man/omake-options.txt
+1 -1 omake-branches/omake_0_9_7_ref/doc/man/omake-pervasives.1
+69 -65 omake-branches/omake_0_9_7_ref/doc/man/omake-pervasives.txt
+1 -1 omake-branches/omake_0_9_7_ref/doc/man/omake-quickstart.1
+10 -10 omake-branches/omake_0_9_7_ref/doc/man/omake-quickstart.txt
+55 -1 omake-branches/omake_0_9_7_ref/doc/man/omake-root.1
+76 -25 omake-branches/omake_0_9_7_ref/doc/man/omake-root.txt
+1 -1 omake-branches/omake_0_9_7_ref/doc/man/omake-rules.1
+10 -10 omake-branches/omake_0_9_7_ref/doc/man/omake-rules.txt
+1 -1 omake-branches/omake_0_9_7_ref/doc/man/omake-shell.1
+10 -10 omake-branches/omake_0_9_7_ref/doc/man/omake-shell.txt
+1 -1 omake-branches/omake_0_9_7_ref/doc/man/omake-system.1
+10 -10 omake-branches/omake_0_9_7_ref/doc/man/omake-system.txt
+1 -1 omake-branches/omake_0_9_7_ref/doc/man/omake.1
+10 -10 omake-branches/omake_0_9_7_ref/doc/man/omake.txt
+1 -1 omake-branches/omake_0_9_7_ref/doc/man/osh.1
+10 -10 omake-branches/omake_0_9_7_ref/doc/man/osh.txt
Binary omake-branches/omake_0_9_7_ref/doc/ps/omake-doc.dvi
Binary omake-branches/omake_0_9_7_ref/doc/ps/omake-doc.pdf
Binary omake-branches/omake_0_9_7_ref/doc/ps/omake-doc.ps
+1 -1 omake-branches/omake_0_9_7_ref/doc/src/omake-prologue.tex
+45 -30 omake-branches/omake_0_9_7_ref/lib/boot/Default
+20 -0 omake-branches/omake_0_9_7_ref/lib/build/C.om
+19 -0 omake-branches/omake_0_9_7_ref/lib/build/LaTeX.om
+23 -2 omake-branches/omake_0_9_7_ref/lib/build/OCaml.om
+1 -1 omake-branches/omake_0_9_7_ref/lib/configure/fam.om
+19 -7 omake-branches/omake_0_9_7_ref/mk/make_config
+12 -4 omake-branches/omake_0_9_7_ref/src/Makefile
+12 -4 omake-branches/omake_0_9_7_ref/src/Makefile.nt
Properties omake-branches/omake_0_9_7_ref/src/ast
Properties omake-branches/omake_0_9_7_ref/src/build
+9 -3 omake-branches/omake_0_9_7_ref/src/build/omake_build.ml
Properties omake-branches/omake_0_9_7_ref/src/builtin
Properties omake-branches/omake_0_9_7_ref/src/clib
+3 -0 omake-branches/omake_0_9_7_ref/src/clib/OMakefile
+24 -12 omake-branches/omake_0_9_7_ref/src/clib/omake_notify.c
+23 -27 omake-branches/omake_0_9_7_ref/src/clib/omake_shell_sys.c
Properties omake-branches/omake_0_9_7_ref/src/env
Properties omake-branches/omake_0_9_7_ref/src/eval
Properties omake-branches/omake_0_9_7_ref/src/exec
Properties omake-branches/omake_0_9_7_ref/src/ir
Properties omake-branches/omake_0_9_7_ref/src/libmojave
+3 -0 omake-branches/omake_0_9_7_ref/src/libmojave/OMakefile
Properties omake-branches/omake_0_9_7_ref/src/magic
Properties omake-branches/omake_0_9_7_ref/src/main
Properties omake-branches/omake_0_9_7_ref/src/shell
+0 -16 omake-branches/omake_0_9_7_ref/src/shell/omake_shell_sys_win32.ml
Properties omake-branches/omake_0_9_7_ref/src/util
+1 -1 omake-branches/omake_0_9_7_ref/version.txt