Merge branch 'master' of git://fiji.sc/fiji
Add more entries to the mailmap

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Merge branch 'master' of https://github.com/fiji/fiji
Weka Segmentation: fixed bug on the number of classes passed to the classifiers. We were not passing classes with zero traces and created inconsistencies.
Add a helper script to determine the commit for a give .jar file

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Build.sh: Do not modify mtimes unnecessarily

E.g. ij-minimaven.jar *wants* to be left alone; otherwise the timestamp
check that should determine whether to download a newer version would
fail always for Jenkins (who builds several times a day).

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Build.sh: no need to list minimaven's dependencies explicitly

We use scijava-common's maven-helper that knows how to determine
dependencies by inspecting the .pom file directly.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Build.sh: force MiniMaven update when Build.sh changed

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Good bye Fakefile

We do not need anymore...

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Good bye, glibc-compat.h

We build the launchers in IJ2 now.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Good bye, JDB tutorial

We have that on the Fiji Wiki now:

	http://fiji.sc/Debugging_intro#Debugging_Java_code_with_jdb

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Remove more obsolete files

These just got stale over the years.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Adjust the convenience Makefile to the present state

We do not build Fiji Build nor launcher in Fiji any longer.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Document Build.sh a bit better

This is only a ruse, really, to force Jenkins to update ij-minimaven
which for some reason got deployed incorrectly.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Use the same javassist version as ImageJ2

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Use the same jsch version as ImageJ2

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Merge branch 'trainable-seg-gui'
Merge branch 'master' of https://github.com/fiji/fiji
Bump the rsyntaxtextarea dependency version to match IJ2's

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Try to address the Fiji vs ImageJ confusion in the main window title

Too many people confuse Fiji for something else than ImageJ. So let's
stress more that we're really aiming at being ImageJ (with batteries
included).

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>