Changes by: Aleksey Nogin (nogin at cs.caltech.edu)
Date: 2006-03-15 23:12:26 -0800 (Wed, 15 Mar 2006)
Revision: 8906
Log message:

      Incremental merge from the 0.9.6.x branch:
         svn merge -r 8567:8757 svn+ssh://svn.metaprl.org/svnroot/mojave/omake-branches/0.9.6.x
         with lots of manual editing.
      

Changes  Path
+6 -0 omake-branches/omake_0_9_7_ref/CHANGELOG.txt
+14 -0 omake-branches/omake_0_9_7_ref/doc/html/changelog.html
+12 -5 omake-branches/omake_0_9_7_ref/doc/html/download.html
+230 -181 omake-branches/omake_0_9_7_ref/doc/html/omake-base.html
+525 -460 omake-branches/omake_0_9_7_ref/doc/html/omake-doc.html
+4 -4 omake-branches/omake_0_9_7_ref/doc/html/omake-language.html
+4 -4 omake-branches/omake_0_9_7_ref/doc/html/omake-options.html
+17 -7 omake-branches/omake_0_9_7_ref/doc/html/omake-pervasives.html
+4 -4 omake-branches/omake_0_9_7_ref/doc/html/omake-quickstart.html
+58 -52 omake-branches/omake_0_9_7_ref/doc/html/omake-root.html
+4 -4 omake-branches/omake_0_9_7_ref/doc/html/omake-rules.html
+4 -4 omake-branches/omake_0_9_7_ref/doc/html/omake-shell.html
+4 -4 omake-branches/omake_0_9_7_ref/doc/html/omake-system.html
+4 -4 omake-branches/omake_0_9_7_ref/doc/html/omake.html
+4 -4 omake-branches/omake_0_9_7_ref/doc/html/osh.html
+50 -5 omake-branches/omake_0_9_7_ref/doc/man/omake-base.1
+73 -9 omake-branches/omake_0_9_7_ref/doc/man/omake-doc.1
+3 -4 omake-branches/omake_0_9_7_ref/doc/man/omake-language.1
+3 -4 omake-branches/omake_0_9_7_ref/doc/man/omake-options.1
+21 -8 omake-branches/omake_0_9_7_ref/doc/man/omake-pervasives.1
+3 -4 omake-branches/omake_0_9_7_ref/doc/man/omake-quickstart.1
+8 -4 omake-branches/omake_0_9_7_ref/doc/man/omake-root.1
+3 -4 omake-branches/omake_0_9_7_ref/doc/man/omake-rules.1
+3 -4 omake-branches/omake_0_9_7_ref/doc/man/omake-shell.1
+3 -4 omake-branches/omake_0_9_7_ref/doc/man/omake-system.1
+3 -4 omake-branches/omake_0_9_7_ref/doc/man/omake.1
+3 -4 omake-branches/omake_0_9_7_ref/doc/man/osh.1
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-base-prologue.tex
+1 -1 omake-branches/omake_0_9_7_ref/doc/src/omake-examples-prologue.tex
+1 -1 omake-branches/omake_0_9_7_ref/doc/src/omake-index-prologue.tex
+1 -1 omake-branches/omake_0_9_7_ref/doc/src/omake-language-prologue.tex
+6 -0 omake-branches/omake_0_9_7_ref/doc/src/omake-macros.pl
+3 -3 omake-branches/omake_0_9_7_ref/doc/src/omake-notes.tex
+1 -1 omake-branches/omake_0_9_7_ref/doc/src/omake-options-prologue.tex
+1 -1 omake-branches/omake_0_9_7_ref/doc/src/omake-pervasives-prologue.tex
+1 -0 omake-branches/omake_0_9_7_ref/doc/src/omake-prologue.tex
+1 -1 omake-branches/omake_0_9_7_ref/doc/src/omake-root-prologue.tex
+1 -1 omake-branches/omake_0_9_7_ref/doc/src/omake-rules-prologue.tex
+1 -1 omake-branches/omake_0_9_7_ref/doc/src/omake-shell-prologue.tex
+1 -1 omake-branches/omake_0_9_7_ref/doc/src/omake-system-prologue.tex
+1 -1 omake-branches/omake_0_9_7_ref/doc/src/osh-prologue.tex
+17 -3 omake-branches/omake_0_9_7_ref/lib/Pervasives.om
+50 -20 omake-branches/omake_0_9_7_ref/lib/build/C.om
+6 -0 omake-branches/omake_0_9_7_ref/lib/build/Common.om
+2 -2 omake-branches/omake_0_9_7_ref/lib/build/LaTeX.om
+4 -10 omake-branches/omake_0_9_7_ref/lib/build/OCaml.om
+7 -7 omake-branches/omake_0_9_7_ref/src/Makefile
+7 -7 omake-branches/omake_0_9_7_ref/src/Makefile.nt
+7 -0 omake-branches/omake_0_9_7_ref/src/OMakefile
+9 -12 omake-branches/omake_0_9_7_ref/src/build/omake_build.ml
+1 -1 omake-branches/omake_0_9_7_ref/src/build/omake_builtin.ml
+9 -9 omake-branches/omake_0_9_7_ref/src/build/omake_rule.ml
+22 -20 omake-branches/omake_0_9_7_ref/src/build/omake_target.ml
+113 -1 omake-branches/omake_0_9_7_ref/src/builtin/omake_builtin_base.ml
+38 -27 omake-branches/omake_0_9_7_ref/src/builtin/omake_builtin_file.ml
+6 -2 omake-branches/omake_0_9_7_ref/src/builtin/omake_builtin_rule.ml
+4 -3 omake-branches/omake_0_9_7_ref/src/builtin/omake_builtin_shell.ml
+28 -28 omake-branches/omake_0_9_7_ref/src/builtin/omake_builtin_test.ml
+5 -11 omake-branches/omake_0_9_7_ref/src/env/omake_ast_lex.mll
+1 -4 omake-branches/omake_0_9_7_ref/src/env/omake_ast_parse.input
+18 -14 omake-branches/omake_0_9_7_ref/src/env/omake_env.ml
+4 -4 omake-branches/omake_0_9_7_ref/src/env/omake_env.mli
+2 -4 omake-branches/omake_0_9_7_ref/src/env/omake_gen_parse.ml
+6 -5 omake-branches/omake_0_9_7_ref/src/eval/omake_eval.ml
+4 -3 omake-branches/omake_0_9_7_ref/src/eval/omake_value.ml
+2 -1 omake-branches/omake_0_9_7_ref/src/ir/omake_install.ml
+32 -9 omake-branches/omake_0_9_7_ref/src/ir/omake_node.ml
+2 -5 omake-branches/omake_0_9_7_ref/src/ir/omake_node.mli
+8 -4 omake-branches/omake_0_9_7_ref/src/ir/omake_node_sig.ml
+3 -2 omake-branches/omake_0_9_7_ref/src/main/omake_shell.ml
+7 -6 omake-branches/omake_0_9_7_ref/src/shell/omake_shell_job.ml