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

[kifer@users.sf.net]

Revision: 1246
          http://sourceforge.net/p/flora/src/1246
Author:   "kifer"
Date:     2016-08-31 02:38:33 +0000 (Wed, 31 Aug 2016)
Log Message:
-----------
Merge remote-tracking branch 'bitbucket_frodo/Coherent' into Flora-local

Modified Paths:
--------------
    trunk/flora2/.gitignore
    trunk/flora2/AT/Makefile
    trunk/flora2/AT/atck1alt.flr
    trunk/flora2/AT/atck2.flr
    trunk/flora2/AT/atck3.flr
    trunk/flora2/AT/flrgclp.flr
    trunk/flora2/AT/gclpe.flr
    trunk/flora2/AT/ogclp.flr
    trunk/flora2/AT/ogclpe.flr
    trunk/flora2/AT/sgclp.flr
    trunk/flora2/Makefile
    trunk/flora2/NMakefile.mak
    trunk/flora2/admin/.excludedFiles
    trunk/flora2/admin/MkFloraInstaller.sh
    trunk/flora2/admin/README
    trunk/flora2/admin/windows/flora2.iss
    trunk/flora2/cc/.gitignore
    trunk/flora2/cc/NMakefile.mak
    trunk/flora2/cc/NMakefile64.mak
    trunk/flora2/cc/cc_config.P
    trunk/flora2/cc/windows/flora_ground.dll
    trunk/flora2/cc/windows/flora_ground.exp
    trunk/flora2/cc/windows/flora_ground.lib
    trunk/flora2/cc/windows/prolog2hilog.dll
    trunk/flora2/cc/windows/prolog2hilog.exp
    trunk/flora2/cc/windows/prolog2hilog.lib
    trunk/flora2/cc/windows64/flora_ground.dll
    trunk/flora2/cc/windows64/flora_ground.exp
    trunk/flora2/cc/windows64/flora_ground.lib
    trunk/flora2/cc/windows64/prolog2hilog.dll
    trunk/flora2/cc/windows64/prolog2hilog.exp
    trunk/flora2/cc/windows64/prolog2hilog.lib
    trunk/flora2/closure/flrcommon.fli
    trunk/flora2/closure/flrsigaxioms.fli
    trunk/flora2/closure/flrtypes.fli
    trunk/flora2/datatypes/flrdtype_sub.P
    trunk/flora2/debugger/flrtabledump.P
    trunk/flora2/debugger/static_data.in
    trunk/flora2/demos/aggregate.flr
    trunk/flora2/demos/benchmark.flr
    trunk/flora2/demos/default.flr
    trunk/flora2/demos/mono_inherit.flr
    trunk/flora2/demos/nonmono_inherit.flr
    trunk/flora2/demos/owl_benchmark.flr
    trunk/flora2/docs/.gitignore
    trunk/flora2/docs/Makefile
    trunk/flora2/docs/flora-packages.tex
    trunk/flora2/docs/flora2-manual.tex
    trunk/flora2/emacs/flora.el
    trunk/flora2/flora2.P
    trunk/flora2/flrarguments.P
    trunk/flora2/flrcompiler.P
    trunk/flora2/flrconfig.P
    trunk/flora2/flrdependency.H
    trunk/flora2/flrdependency.P
    trunk/flora2/flrincludes/flora_characters.flh
    trunk/flora2/flrincludes/flora_errors.flh
    trunk/flora2/flrincludes/flora_exceptions.flh
    trunk/flora2/flrincludes/flora_prefix.flh
    trunk/flora2/flrincludes/flora_terms.flh
    trunk/flora2/flrlexer.P
    trunk/flora2/flrlibman.P
    trunk/flora2/flrparser.H
    trunk/flora2/flrparser.P
    trunk/flora2/flrporting.P
    trunk/flora2/flrprint.P
    trunk/flora2/flrprolog.P
    trunk/flora2/flrshell.H
    trunk/flora2/flrshell.P
    trunk/flora2/flrutils.H
    trunk/flora2/flrutils.P
    trunk/flora2/flrwrapper.P
    trunk/flora2/includes/flrdefinition.fli
    trunk/flora2/java/API/javaAPI/src/net/sf/flora2/API/FloraSession.java
    trunk/flora2/java/interprolog.jar
    trunk/flora2/java/unixVariables.sh
    trunk/flora2/java/windowsVariables.bat
    trunk/flora2/lib/flrbasetype.flr
    trunk/flora2/lib/flrsystem.flr
    trunk/flora2/makeflora
    trunk/flora2/makeflora.bat
    trunk/flora2/pkgs/prolog/Makefile
    trunk/flora2/runflora.bat
    trunk/flora2/syslib/Makefile
    trunk/flora2/syslib/NMakefile.mak
    trunk/flora2/syslib/flranswer.P
    trunk/flora2/syslib/flrcanon.P
    trunk/flora2/syslib/flrcontrol.P
    trunk/flora2/syslib/flrdecode.P
    trunk/flora2/syslib/flrerrhandler.P
    trunk/flora2/syslib/flrgateway.P
    trunk/flora2/syslib/flrload.P
    trunk/flora2/syslib/flrnewoid.P
    trunk/flora2/syslib/flrtables.P
    trunk/flora2/syslib/flrtruthvalue.P
    trunk/flora2/version.flh
    trunk/flora2-testsuite/defeasible/atco2/justification_test_fl.flr
    trunk/flora2-testsuite/defeasible/new_gclp/temp_paradox2.flr
    trunk/flora2-testsuite/general_tests/.gitignore
    trunk/flora2-testsuite/general_tests/add_load.flr
    trunk/flora2-testsuite/general_tests/assoc.flr
    trunk/flora2-testsuite/general_tests/basetypes.flr
    trunk/flora2-testsuite/general_tests/compile_control.flr
    trunk/flora2-testsuite/general_tests/decodetest_old
    trunk/flora2-testsuite/general_tests/descr2.flr
    trunk/flora2-testsuite/general_tests/descr2_old
    trunk/flora2-testsuite/general_tests/framely.flr
    trunk/flora2-testsuite/general_tests/pps.flr
    trunk/flora2-testsuite/general_tests/prolog_directive_old
    trunk/flora2-testsuite/general_tests/rector_old
    trunk/flora2-testsuite/general_tests/reification_old
    trunk/flora2-website/florahome.html
    trunk/flora2-website/installation.html

Added Paths:
-----------
    trunk/flora2/docs/pkg-flora-persistence.tex
    trunk/flora2/docs/pkg-flora-prettyprint.tex
    trunk/flora2/docs/pkg-flora-protege.tex
    trunk/flora2/docs/pkg-flora-xml.tex
    trunk/flora2/docs/pkg-java-flora.tex
    trunk/flora2/etc/.gitignore
    trunk/flora2/flrshell_loop_handler.P
    trunk/flora2-testsuite/general_tests/ccdb.flr
    trunk/flora2-testsuite/general_tests/ccdb_old
    trunk/flora2-testsuite/general_tests/lt2.flr
    trunk/flora2-testsuite/general_tests/lt2_old
    trunk/flora2-testsuite/general_tests/typecheck2.flr
    trunk/flora2-testsuite/general_tests/typecheck2_old

Removed Paths:
-------------
    trunk/flora2/datatypes/ergoisms/
    trunk/flora2/docs/flora-flrjava.tex
    trunk/flora2/docs/flora-flrxml.tex
    trunk/flora2/docs/flora-persistence.tex
    trunk/flora2/docs/flora-prettyprint.tex
    trunk/flora2/docs/flora-protege.tex

Property Changed:
----------------
    trunk/flora2/AT/NMakefile.mak
    trunk/flora2/NMakefile.mak
    trunk/flora2/admin/BinaryTarBall.sh
    trunk/flora2/cc/windows/prolog2hilog.dll
    trunk/flora2/closure/NMakefile.mak
    trunk/flora2/demos/NMakefile.mak
    trunk/flora2/lib/NMakefile.mak
    trunk/flora2/makeflora.bat