Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2008-03-19 10:05:44 -0700 (Wed, 19 Mar 2008)
Revision: 12776
Log message:

      Merged 12670:12775 from svn://svn.metaprl.org/omake-branches/jumbo/var3 into
     int - automated merge with a bit of a manual conflict resolution.

Changes  Path(relative to omake-branches/jumbo/int)
Properties .
+0 -3 doc/OMakefile
+5 -5 doc/html/omake-base.html
+29 -29 doc/html/omake-doc.html
+1 -1 doc/html/omake-grammar.html
+4 -4 doc/html/omake-language-examples.html
+2 -2 doc/html/omake-language.html
+12 -12 doc/html/omake-pervasives.html
+1 -1 doc/html/omake-references.html
+3 -3 doc/html/omake-system.html
+1 -1 doc/html/omake-toc.html
+488 -488 doc/info/omake-doc.info
+2 -2 doc/info/omake-doc.info-1
+1 -1 doc/info/omake-doc.info-10
+2 -2 doc/info/omake-doc.info-2
+4 -4 doc/info/omake-doc.info-3
+5 -5 doc/info/omake-doc.info-5
+3 -3 doc/info/omake-doc.info-6
+12 -13 doc/info/omake-doc.info-7
+1 -1 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
+1 -1 doc/src/omake-grammar.tex
+4 -4 doc/src/omake-language-examples.tex
+2 -2 doc/src/omake-language.tex
+30 -31 doc/txt/omake-doc.txt
+15 -15 lib/Pervasives.om
+2 -2 lib/build/C.om
+1 -3 lib/build/OCaml.om
+17 -38 src/build/omake_build.ml
+1 -1 src/builtin/omake_builtin_base.ml
+1 -1 src/builtin/omake_builtin_fun.ml
+3 -3 src/builtin/omake_builtin_io_fun.ml
+4 -4 src/builtin/omake_builtin_object.ml
+0 -40 src/eval/omake_eval.ml
+0 -1 src/eval/omake_eval.mli
+15 -0 test/simple/Test10
Copied test/targets/Test5/ (from rev 12775, omake-branches/jumbo/var3/test/targets/Test5)
Properties test/targets/Test5/ (from rev 12775, omake-branches/jumbo/var3/test/targets/Test5)