GitLab

	modified:   Makefile
	modified:   manifest.mf
	deleted:    src/fr/imag/forge/Scidetect/Checker/Classifier.java~
	deleted:    src/fr/imag/forge/Scidetect/Checker/DistantCalculator.java~
	deleted:    src/fr/imag/forge/Scidetect/Checker/Indexer.java~
	deleted:    src/fr/imag/forge/Scidetect/Checker/Reader.java~
	deleted:    src/fr/imag/forge/Scidetect/Logger/Log.java~
	deleted:    src/fr/imag/forge/Scidetect/TextExtractor/Xmlextractor.java~
	deleted:    src/fr/imag/forge/Scidetect/TextExtractor/commandexecutor.java~
	deleted:    src/fr/imag/forge/Scidetect/TextExtractor/normalizer.java~
	deleted:    src/fr/imag/forge/Scidetect/TextExtractor/pdfextractor.java~
	deleted:    src/fr/imag/forge/Scidetect/scigenchecker_local/ScigenChecker_Local.java~

	modified:   tex/README.tex

	new file:   tex/README.pdf
	new file:   tex/README.tex

Merge branch 'master' of git+ssh://scm.forge.imag.fr/var/lib/gforge/chroot/scmrepos/git/scidetect/scidetect

 Changes to be committed:
	modified:   Makefile

On branch master
Your branch is up-to-date with 'origin/master'.

 Changes to be committed:
	new file:   Makefile
	deleted:    build/built-jar.properties
	deleted:    build/classes/.netbeans_automatic_build
	deleted:    build/classes/.netbeans_update_resources
	deleted:    build/classes/Checker/Classifier.class
	deleted:    build/classes/Checker/DistantCalculator.class
	deleted:    build/classes/Checker/Indexer.class
	deleted:    build/classes/Checker/Reader.class
	deleted:    build/classes/TextExtractor/Xmlextractor.class
	deleted:    build/classes/TextExtractor/commandexecutor.class
	deleted:    build/classes/TextExtractor/normalizer.class
	deleted:    build/classes/TextExtractor/pdfextractor.class
	deleted:    build/classes/scigenchecker_local/ScigenChecker_Local.class

 Changes not staged for commit:
	modified:   ScigenChecker_Local.jar
	../.classpath
	../.project
	.DS_Store
	ScigenChecker_Local.old.jar
	ScigenChecker_Local2015-02-25.jar
	classes/
	doc/
	src/Checker/.DS_Store
	test/