Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2007-10-29 12:42:00 -0700 (Mon, 29 Oct 2007)
Revision: 12452
Log message:

      Merged 12376:12448 from 0.9.8.x into var2 (automated merge followed by some
     manual conflict resolution).

Changes  Path(relative to omake-branches/jumbo/var2)
Properties .
+10 -2 INSTALL
+3 -4 OMakefile
Deleted doc/html/announce.txt
Deleted doc/html/changelog.html
Deleted doc/html/contents_motif.gif
Deleted doc/html/download.html
Deleted doc/html/images/
Deleted doc/html/index.html
Deleted doc/html/next_motif.gif
+579 -553 doc/html/omake-all-index.html
+39 -39 doc/html/omake-autoconf.html
+145 -134 doc/html/omake-base.html
+4 -4 doc/html/omake-build-examples.html
+174 -165 doc/html/omake-build.html
+470 -462 doc/html/omake-contents.html
+23 -23 doc/html/omake-detail.html
+2245 -2043 doc/html/omake-doc.html
+159 -146 doc/html/omake-fun-index.html
+41 -41 doc/html/omake-grammar.html
+23 -23 doc/html/omake-language-examples.html
+37 -29 doc/html/omake-language-naming.html
+111 -45 doc/html/omake-language.html
+26 -25 doc/html/omake-obj-index.html
+3 -3 doc/html/omake-option-index.html
+45 -45 doc/html/omake-options.html
+32 -29 doc/html/omake-pervasives.html
+3 -3 doc/html/omake-quickstart.html
+12 -11 doc/html/omake-references.html
+65 -65 doc/html/omake-rules.html
+32 -32 doc/html/omake-shell.html
+202 -159 doc/html/omake-system.html
+5 -5 doc/html/omake-target-index.html
+4 -4 doc/html/omake-toc.html
+105 -100 doc/html/omake-var-index.html
+3 -3 doc/html/omake.html
Deleted doc/html/omake_lists.html
Deleted doc/html/omake_papers.html
Deleted doc/html/omake_users.html
+13 -13 doc/html/osh.html
Deleted doc/html/previous_motif.gif
Copied doc/images/ (from rev 12448, omake-branches/0.9.8.x/doc/images)
Properties doc/images/ (from rev 12448, omake-branches/0.9.8.x/doc/images)
+481 -475 doc/info/omake-doc.info
+5 -5 doc/info/omake-doc.info-1
+27 -9 doc/info/omake-doc.info-10
+157 -158 doc/info/omake-doc.info-2
+126 -99 doc/info/omake-doc.info-3
+97 -124 doc/info/omake-doc.info-4
+166 -144 doc/info/omake-doc.info-5
+133 -143 doc/info/omake-doc.info-6
+212 -228 doc/info/omake-doc.info-7
+264 -278 doc/info/omake-doc.info-8
+315 -25 doc/info/omake-doc.info-9
Change(bin) doc/ps/omake-doc.dvi
Change(bin) doc/ps/omake-doc.pdf
Change(bin) doc/ps/omake-doc.ps
+5 -4 doc/src/omake-doc.tex
+66 -10 doc/src/omake-language.tex
+425 -164 doc/txt/omake-doc.txt
Copied doc/webpage/ (from rev 12448, omake-branches/0.9.8.x/doc/webpage)
+0 -0 doc/webpage/manual/
+20 -6 lib/Pervasives.om
+2 -5 lib/configure/Configure.om
+2 -2 lib/parse/C/Lex.om
Copied lib/parse/LaTeX/ (from rev 12448, omake-branches/0.9.8.x/lib/parse/LaTeX)
Properties lib/parse/LaTeX/ (from rev 12448, omake-branches/0.9.8.x/lib/parse/LaTeX)
+1 -1 omake.spec
+1 -1 omake.spec.in
+10 -3 src/ast/omake_ast.ml
+134 -14 src/ast/omake_ast_print.ml
+4 -3 src/ast/omake_ast_print.mli
+14 -7 src/ast/omake_ast_util.ml
+4 -1 src/build/omake_rule.ml
+3 -3 src/builtin/omake_builtin_file.ml
+4 -2 src/builtin/omake_builtin_io_fun.ml
+150 -2 src/builtin/omake_builtin_object.ml
+3 -3 src/builtin/omake_builtin_sys.ml
+11 -2 src/env/omake_ast_lex.mll
+77 -41 src/env/omake_ast_parse.input
+11 -3 src/env/omake_command_digest.ml
+109 -47 src/env/omake_env.ml
+6 -5 src/env/omake_env.mli
+8 -1 src/env/omake_gen_parse.ml
+57 -44 src/env/omake_ir_ast.ml
+3 -1 src/eval/omake_eval.ml
+6 -4 src/ir/omake_ir.ml
+6 -4 src/ir/omake_ir_free_vars.ml
+2 -1 src/ir/omake_options.mli
+1 -1 src/ir/omake_pos.ml
+6 -1 src/ir/omake_value_print.ml
+2 -2 src/ir/omake_value_type.ml
+0 -1 test/OMakefile
+8 -8 test/curry/Test2
+5 -5 test/curry/Test5
+2 -2 test/keyword/Test1
+5 -5 test/keyword/Test2
+3 -3 test/keyword/Test3
Copied test/keyword/Test4 (from rev 12448, omake-branches/0.9.8.x/test/keyword/Test4)
Copied test/keyword/Test5 (from rev 12448, omake-branches/0.9.8.x/test/keyword/Test5)
Copied test/keyword/Test6 (from rev 12448, omake-branches/0.9.8.x/test/keyword/Test6)
+2 -1 test/memo/Test6/OMakeroot
+1 -4 test/object/Test08
Properties test/shell/
Copied test/shell/Test5 (from rev 12448, omake-branches/0.9.8.x/test/shell/Test5)
+1 -1 version.txt