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

Revision: 1206
          http://sourceforge.net/p/flora/src/1206
Author:   kifer
Date:     2014-07-15 02:54:43 +0000 (Tue, 15 Jul 2014)
Log Message:
-----------
Merge from ergo

Modified Paths:
--------------
    trunk/.gitignore
    trunk/flora2/.gitignore
    trunk/flora2/AT/Makefile
    trunk/flora2/Makefile
    trunk/flora2/admin/.excludedFiles
    trunk/flora2/admin/windows/.gitignore
    trunk/flora2/admin/windows/NOTES_bundle.txt
    trunk/flora2/admin/windows/flora2bundle.iss
    trunk/flora2/closure/Makefile
    trunk/flora2/datatypes/Makefile
    trunk/flora2/debugger/Makefile
    trunk/flora2/demos/Makefile
    trunk/flora2/docs/Makefile
    trunk/flora2/flora2.P
    trunk/flora2/genincludes/Makefile
    trunk/flora2/includes/Makefile
    trunk/flora2/lib/Makefile
    trunk/flora2/makeflora
    trunk/flora2/pkgs/Makefile
    trunk/flora2/pkgs/prolog/flrpm.P
    trunk/flora2/syslib/Makefile
    trunk/flora2/version.flh
    trunk/flora2-testsuite/delaystests/.gitignore
    trunk/flora2-testsuite/exporttest/.gitignore
    trunk/flora2-testsuite/functions/.gitignore
    trunk/flora2-testsuite/general_tests/.gitignore
    trunk/flora2-testsuite/symbols/.gitignore
    trunk/flora2-website/aboutFlogic.html
    trunk/flora2-website/aboutTR.html
    trunk/flora2-website/download.html
    trunk/flora2-website/florabar.html
    trunk/flora2-website/florahome.html
    trunk/flora2-website/installation.html
    trunk/flora2-website/relatedWorks.html
    trunk/flora2-website/release_notes.html
    trunk/flora2-website/tutorial.html

Added Paths:
-----------
    trunk/flora2/AT/prolog/CompileChangedFiles.sh
    trunk/flora2/AT/prolog/Makefile
    trunk/flora2/pkgs/prolog/CompileChangedFiles.sh
    trunk/flora2/pkgs/prolog/Makefile

Removed Paths:
-------------
    trunk/flora2/docs/.gitignore
    trunk/flora2/etc/.gitignore
    trunk/flora2/flrincludes/.gitignore