[Omake] SVN Commit: OMake Build System (Rev. 10315)

[Jason Hickey]

operation, re-creating all conflicts that ever existed.

----
Changes:
    +12 -0	omake-jumbo-branches/DEPENDENCIES
    +96 -1	omake-jumbo-branches/all-features/0.9.8.x/src/builtin/omake_builtin_object.ml
    +0 -0	omake-jumbo-branches/all-features/0.9.8.x/src/env/omake_ir_ast.ml
    +1 -1	omake-jumbo-branches/all-features/0.9.8.x/src/ir/omake_ir_print.mli
    +1 -1	omake-jumbo-branches/all-features/0.9.9.x/doc/txt/omake-doc.txt
    Added	omake-jumbo-branches/all-features/boring
    +81 -0	omake-jumbo-branches/auto/0.9.8.x/src/builtin/omake_builtin_object.ml
    Added	omake-jumbo-branches/auto/boring
    +81 -0	omake-jumbo-branches/const/0.9.8.x/src/builtin/omake_builtin_object.ml
    Added	omake-jumbo-branches/const/boring
    +96 -1	omake-jumbo-branches/export/0.9.8.x/src/builtin/omake_builtin_object.ml
    Added	omake-jumbo-branches/export/boring
    +81 -0	omake-jumbo-branches/file/0.9.8.x/src/builtin/omake_builtin_object.ml
    Added	omake-jumbo-branches/file/boring
    +81 -0	omake-jumbo-branches/keyword/0.9.8.x/src/builtin/omake_builtin_object.ml
    Added	omake-jumbo-branches/keyword/boring
    +81 -0	omake-jumbo-branches/open/0.9.8.x/src/builtin/omake_builtin_object.ml
    Added	omake-jumbo-branches/open/boring
    Properties	omake-jumbo-branches/parse/
    +4 -0	omake-jumbo-branches/parse/0.9.8.x/lib/Pervasives.om
    +0 -2	omake-jumbo-branches/parse/0.9.8.x/lib/build/C.om
    +14 -7	omake-jumbo-branches/parse/0.9.8.x/lib/parse/C/Parse.om
    +2 -2	omake-jumbo-branches/parse/0.9.8.x/src/builtin/omake_builtin_io_fun.ml
    +96 -1	omake-jumbo-branches/parse/0.9.8.x/src/builtin/omake_builtin_object.ml
    +1 -1	omake-jumbo-branches/parse/0.9.8.x/src/env/omake_env.mli
    +0 -0	omake-jumbo-branches/parse/0.9.8.x/src/env/omake_ir_ast.ml
    +1 -1	omake-jumbo-branches/parse/0.9.8.x/src/ir/omake_ir_print.mli
    Properties	omake-jumbo-branches/parse/0.9.8.x/tests/parse/C/test3/
    +1 -1	omake-jumbo-branches/parse/0.9.8.x/tests/parse/C/test3/OMakefile
    Added	omake-jumbo-branches/parse/boring
    +81 -0	omake-jumbo-branches/var1/0.9.8.x/src/builtin/omake_builtin_object.ml
    Added	omake-jumbo-branches/var1/boring
    +81 -0	omake-jumbo-branches/var2/0.9.8.x/src/builtin/omake_builtin_object.ml
    Added	omake-jumbo-branches/var2/boring
    +81 -0	omake-jumbo-branches/var3/0.9.8.x/src/builtin/omake_builtin_object.ml
    Added	omake-jumbo-branches/var3/boring
    +81 -0	omake-jumbo-branches/var4/0.9.8.x/src/builtin/omake_builtin_object.ml
    Added	omake-jumbo-branches/var4/boring
 
A hyperlinked version of this commit is available at
http://svn.metaprl.org/commitlogs/omake/2007-04.html#07/04/01.17:20:10