Changes by: Aleksey Nogin (nogin at cs.caltech.edu)
Date: 2005-09-14 22:49:49 -0700 (Wed, 14 Sep 2005)
Revision: 2019
Log message:

      - Merging (with a lot of hand-editing):
         - Trunk revisions 1458:2015
         - 0.9.6.x branch revisions 2014:2017
      
        I believe that now the branch contains all the changes made elsewhere up to
        revision 2017 (inclusive).
      
      - There were a few places with code of the form:
      
         public. =
            FOO = default
            static. =
                FOO = something
                println(I like $(FOO))
      
      Note that this does not work correctly! The value that is printed here is the
      "default", not "something". I am leaving it for Jason to figure out and for
      now I am simply moving all those "FOO = default" inside the "static" section.
      

Changes  Path
+9 -0 omake-branches/omake_0_9_7_pre7/CHANGELOG.txt
+12 -0 omake-branches/omake_0_9_7_pre7/INSTALL
+16 -11 omake-branches/omake_0_9_7_pre7/OMakefile
+3 -3 omake-branches/omake_0_9_7_pre7/doc/OMakefile
+3 -3 omake-branches/omake_0_9_7_pre7/doc/html/announce.txt
+37 -2 omake-branches/omake_0_9_7_pre7/doc/html/changelog.html
+19 -7 omake-branches/omake_0_9_7_pre7/doc/html/download.html
+279 -282 omake-branches/omake_0_9_7_pre7/doc/html/omake-base.html
+784 -671 omake-branches/omake_0_9_7_pre7/doc/html/omake-doc.html
+3 -3 omake-branches/omake_0_9_7_pre7/doc/html/omake-language.html
+3 -3 omake-branches/omake_0_9_7_pre7/doc/html/omake-options.html
+3 -3 omake-branches/omake_0_9_7_pre7/doc/html/omake-pervasives.html
+3 -3 omake-branches/omake_0_9_7_pre7/doc/html/omake-quickstart.html
+8 -4 omake-branches/omake_0_9_7_pre7/doc/html/omake-root.html
+3 -3 omake-branches/omake_0_9_7_pre7/doc/html/omake-rules.html
+3 -3 omake-branches/omake_0_9_7_pre7/doc/html/omake-shell.html
+3 -3 omake-branches/omake_0_9_7_pre7/doc/html/omake-system.html
+3 -3 omake-branches/omake_0_9_7_pre7/doc/html/omake.html
+3 -3 omake-branches/omake_0_9_7_pre7/doc/html/osh.html
+63 -59 omake-branches/omake_0_9_7_pre7/doc/man/omake-base.1
+99 -102 omake-branches/omake_0_9_7_pre7/doc/man/omake-base.txt
+323 -214 omake-branches/omake_0_9_7_pre7/doc/man/omake-doc.1
+414 -353 omake-branches/omake_0_9_7_pre7/doc/man/omake-doc.txt
+2 -2 omake-branches/omake_0_9_7_pre7/doc/man/omake-language.1
+2 -2 omake-branches/omake_0_9_7_pre7/doc/man/omake-language.txt
+2 -2 omake-branches/omake_0_9_7_pre7/doc/man/omake-options.1
+2 -2 omake-branches/omake_0_9_7_pre7/doc/man/omake-options.txt
+6 -6 omake-branches/omake_0_9_7_pre7/doc/man/omake-pervasives.1
+2 -2 omake-branches/omake_0_9_7_pre7/doc/man/omake-pervasives.txt
+2 -2 omake-branches/omake_0_9_7_pre7/doc/man/omake-quickstart.1
+2 -2 omake-branches/omake_0_9_7_pre7/doc/man/omake-quickstart.txt
+26 -87 omake-branches/omake_0_9_7_pre7/doc/man/omake-root.1
+16 -52 omake-branches/omake_0_9_7_pre7/doc/man/omake-root.txt
+2 -2 omake-branches/omake_0_9_7_pre7/doc/man/omake-rules.1
+2 -2 omake-branches/omake_0_9_7_pre7/doc/man/omake-rules.txt
+2 -2 omake-branches/omake_0_9_7_pre7/doc/man/omake-shell.1
+2 -2 omake-branches/omake_0_9_7_pre7/doc/man/omake-shell.txt
+2 -2 omake-branches/omake_0_9_7_pre7/doc/man/omake-system.1
+2 -2 omake-branches/omake_0_9_7_pre7/doc/man/omake-system.txt
+2 -2 omake-branches/omake_0_9_7_pre7/doc/man/omake.1
+2 -2 omake-branches/omake_0_9_7_pre7/doc/man/omake.txt
+2 -2 omake-branches/omake_0_9_7_pre7/doc/man/osh.1
+2 -2 omake-branches/omake_0_9_7_pre7/doc/man/osh.txt
Binary omake-branches/omake_0_9_7_pre7/doc/ps/omake-doc.dvi
Binary omake-branches/omake_0_9_7_pre7/doc/ps/omake-doc.pdf
Binary omake-branches/omake_0_9_7_pre7/doc/ps/omake-doc.ps
+2 -2 omake-branches/omake_0_9_7_pre7/doc/src/omake-prologue.tex
+3 -1 omake-branches/omake_0_9_7_pre7/lib/Pervasives.om
+6 -1 omake-branches/omake_0_9_7_pre7/lib/build/C.om
+6 -5 omake-branches/omake_0_9_7_pre7/lib/build/LaTeX.om
+29 -26 omake-branches/omake_0_9_7_pre7/lib/build/OCaml.om
+2 -1 omake-branches/omake_0_9_7_pre7/make_checkout
Copied omake-branches/omake_0_9_7_pre7/make_dmg
+38 -5 omake-branches/omake_0_9_7_pre7/mk/defaults
+6 -7 omake-branches/omake_0_9_7_pre7/mk/make_config
Binary omake-branches/omake_0_9_7_pre7/omake.aip
Properties omake-branches/omake_0_9_7_pre7/omake.aip
Binary omake-branches/omake_0_9_7_pre7/osx_resources/OMake.pmproj
+2 -0 omake-branches/omake_0_9_7_pre7/osx_resources/installer_files/ReadMe.txt
Properties omake-branches/omake_0_9_7_pre7/src/clib
+2 -2 omake-branches/omake_0_9_7_pre7/src/env/omake_ast_lex.mll
+1 -2 omake-branches/omake_0_9_7_pre7/src/env/omake_ir_semant.ml
+5 -2 omake-branches/omake_0_9_7_pre7/src/eval/omake_eval.ml
+3 -3 omake-branches/omake_0_9_7_pre7/src/main/OMakefile
+0 -1 omake-branches/omake_0_9_7_pre7/src/shell/omake_shell_job.ml
+1 -1 omake-branches/omake_0_9_7_pre7/src/shell/omake_shell_lex.mll