Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2007-09-07 11:50:33 -0700 (Fri, 07 Sep 2007)
Revision: 12126
Log message:

      Merge 11922:12124 from svn+ssh://svn.metaprl.org/svnroot/mojave/omake-branches/0.9.8.x into keyword
     (automated merge with hand-resolution of conflicts).

Changes  Path(relative to omake-branches/jumbo/keyword)
Properties .
+1 -1 OMakefile
+11 -9 doc/html/download.html
+1 -1 doc/src/omake-build-examples.tex
+2 -2 doc/src/omake-language-examples.tex
+4 -4 doc/src/omake-language.tex
+2 -2 doc/src/omake-rules.tex
+12 -0 lib/Pervasives.om
+19 -38 lib/build/OCaml.om
Deleted ocamldep/
+1 -3 omake.aip
+1 -1 omake.spec
+3 -3 src/build/omake_rule.ml
+22 -8 src/builtin/omake_builtin_base.ml
+127 -15 src/builtin/omake_builtin_file.ml
+1 -2 src/builtin/omake_builtin_io.ml
+4 -3 src/builtin/omake_builtin_object.ml
+112 -0 src/builtin/omake_builtin_sys.ml
+16 -14 src/env/omake_ast_lex.mll
+43 -107 src/env/omake_env.ml
+3 -6 src/env/omake_env.mli
+49 -21 src/env/omake_ir_semant.ml
+5 -4 src/env/omake_ir_semant.mli
+3 -3 src/eval/omake_eval.ml
+1 -1 src/eval/omake_eval.mli
+1 -1 src/eval/omake_value.ml
+1 -1 src/ir/omake_ir.ml
+23 -12 src/ir/omake_symbol.ml
+2 -9 src/ir/omake_value_type.ml
+1 -0 src/ir/omake_var.ml
+1 -0 src/ir/omake_var.mli
+4 -4 src/main/omake_shell.ml
+99 -0 src/util/omake_handle_table.ml
Copied test/memo/Test6/ (from rev 12124, omake-branches/0.9.8.x/test/memo/Test6)
Properties test/memo/Test6/ (from rev 12124, omake-branches/0.9.8.x/test/memo/Test6)
Copied test/return/ (from rev 12124, omake-branches/0.9.8.x/test/return)
Properties test/return/ (from rev 12124, omake-branches/0.9.8.x/test/return)
Copied test/simple/Test9 (from rev 12124, omake-branches/0.9.8.x/test/simple/Test9)
+1 -1 version.txt