Changes by: Aleksey Nogin (nogin at cs.caltech.edu)
Date: 2006-03-16 17:47:07 -0800 (Thu, 16 Mar 2006)
Revision: 8920
Log message:

      Incremental 0.9.6.x branch merge:
         svn merge -r 8872:8892 svn+ssh://svn.metaprl.org/svnroot/mojave/omake-branches/0.9.6.x
         (with some hand editing).
      
      Note: rev 8872 did not have to be merged because the .SUBDIRS environment was
      already handled correctly.
      

Changes  Path
+2 -0 omake-branches/omake_0_9_7_ref/doc/man/omake-base.1
+21 -6 omake-branches/omake_0_9_7_ref/doc/man/omake-doc.1
+19 -6 omake-branches/omake_0_9_7_ref/doc/man/omake-root.1
+20 -9 omake-branches/omake_0_9_7_ref/lib/build/C.om
+6 -3 omake-branches/omake_0_9_7_ref/lib/build/LaTeX.om
+26 -7 omake-branches/omake_0_9_7_ref/lib/build/OCaml.om
+4 -4 omake-branches/omake_0_9_7_ref/mk/make_gen
+0 -7 omake-branches/omake_0_9_7_ref/src/OMakefile
+1 -1 omake-branches/omake_0_9_7_ref/src/build/omake_rule.ml
+2 -2 omake-branches/omake_0_9_7_ref/src/build/omake_rule.mli
+3 -0 omake-branches/omake_0_9_7_ref/src/builtin/omake_builtin_base.ml
+5 -1 omake-branches/omake_0_9_7_ref/src/builtin/omake_builtin_file.ml
+2 -1 omake-branches/omake_0_9_7_ref/src/builtin/omake_builtin_test.ml
+2 -1 omake-branches/omake_0_9_7_ref/src/ir/omake_install.ml
+1 -1 omake-branches/omake_0_9_7_ref/src/main/omake_main.ml