[Flora-commits] SF.net SVN: flora2 commit:[1234] trunk

[<ki...@us...>]

Revision: 1234
          http://sourceforge.net/p/flora/src/1234
Author:   kifer
Date:     2015-04-29 01:35:33 +0000 (Wed, 29 Apr 2015)
Log Message:
-----------
Merge bug fixes from the ergo tree

Modified Paths:
--------------
    trunk/.gitignore
    trunk/flora2/AT/Makefile
    trunk/flora2/Makefile
    trunk/flora2/closure/flrcommon.fli
    trunk/flora2/closure/flreqltrailer.fli
    trunk/flora2/closure/flreqltrailer_common.fli
    trunk/flora2/closure/flreqltrailer_inh.fli
    trunk/flora2/closure/flrnoeqltrailer.fli
    trunk/flora2/closure/flrnoeqltrailer_common.fli
    trunk/flora2/closure/flrnoeqltrailer_inh.fli
    trunk/flora2/closure/flrtypes.fli
    trunk/flora2/debugger/flrterminyzer.P
    trunk/flora2/debugger/static_data.in
    trunk/flora2/demos/benchmark.flr
    trunk/flora2/demos/mix.flr
    trunk/flora2/demos/mod1.flr
    trunk/flora2/demos/owl_benchmark.flr
    trunk/flora2/docs/flora2-manual.tex
    trunk/flora2/flora2.P
    trunk/flora2/flrcompiler.P
    trunk/flora2/flrcomposer.P
    trunk/flora2/flrincludes/flora_errors.flh
    trunk/flora2/flrincludes/flora_terms.flh
    trunk/flora2/flrnosymbolcontext.P
    trunk/flora2/flroperator.P
    trunk/flora2/flrparser.P
    trunk/flora2/flrporting.P
    trunk/flora2/flrprint.P
    trunk/flora2/flrprolog.P
    trunk/flora2/flrregistry.P
    trunk/flora2/flrshell.H
    trunk/flora2/flrshell.P
    trunk/flora2/flrsimpleprimitive.P
    trunk/flora2/flrutils.H
    trunk/flora2/flrutils.P
    trunk/flora2/flrwrapper.H
    trunk/flora2/flrwrapper.P
    trunk/flora2/includes/flrdefinition.fli
    trunk/flora2/java/interprolog.jar
    trunk/flora2/lib/Makefile
    trunk/flora2/lib/flrsystem.flr
    trunk/flora2/lib/flrtypeconstraint.flr
    trunk/flora2/pkgs/Makefile
    trunk/flora2/syslib/flranswer.P
    trunk/flora2/syslib/flrauxil.P
    trunk/flora2/syslib/flrcallflora.P
    trunk/flora2/syslib/flrdecode.P
    trunk/flora2/syslib/flrdynrule.P
    trunk/flora2/syslib/flrerrhandler.P
    trunk/flora2/syslib/flrgateway.P
    trunk/flora2/syslib/flroptimize.P
    trunk/flora2/syslib/flrsemantics.P
    trunk/flora2/syslib/flrstoragebase.P
    trunk/flora2/syslib/flrstorageutils.P
    trunk/flora2-testsuite/apptests/gpmanager_test.flr
    trunk/flora2-testsuite/general_tests/composite_class.flr
    trunk/flora2-testsuite/general_tests/descriptors.flr
    trunk/flora2-testsuite/general_tests/guizhen.flr
    trunk/flora2-testsuite/general_tests/inher_termination.flr
    trunk/flora2-testsuite/general_tests/london_map.flr
    trunk/flora2-testsuite/general_tests/mon_inherit.flr
    trunk/flora2-testsuite/general_tests/pretty.flr
    trunk/flora2-testsuite/general_tests/pretty_old
    trunk/flora2-testsuite/general_tests/rector.flr
    trunk/flora2-testsuite/general_tests/reification.flr
    trunk/flora2-testsuite/general_tests/reification_old
    trunk/flora2-testsuite/general_tests/services_incr.flr
    trunk/flora2-testsuite/general_tests/typecheck.flr
    trunk/flora2-testsuite/general_tests/typedvars.flr
    trunk/flora2-testsuite/general_tests/wine2.flr
    trunk/flora2-website/release_notes.html

Added Paths:
-----------
    trunk/flora2/flrincludes/flora_contexts.flh
    trunk/flora2/lib/.gitignore
    trunk/flora2-testsuite/general_tests/cardcheck.flr
    trunk/flora2-testsuite/general_tests/cardcheck_old
    trunk/flora2-testsuite/general_tests/descr2.flr
    trunk/flora2-testsuite/general_tests/descr2_old