Trainable Weka Segmentation: include flag to use old color format in the instance creation.
Trainable Weka Segmentation: include flag to use old color format in the array.
Merge branch 'master' into trainable-seg-gui
Trainable Weka Segmentation: added option to use old color format when creating instances in place.
Trainable Weka Segmentation: added method to read the old color format flag.
Trainable Weka Segmentation: added message when using old color format.
Merge remote-tracking branch 'origin/master' into track-mate
updated mpicbg and TrakEM2 to enable spring mesh optimization with
the previous optimizer (legacy), reproduces previous results and sometimes
converges faster
Fiji_Plugins: move Rounded_Rectangle to Edit>Selection menu
Merge pull request #35 from imagejan/fiji-master

Fiji_Plugins: move Rounded_Rectangle to Edit>Selection menu
Work around forgotten push in the TrakEM2 submodule

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Merge branch 'master' of https://github.com/fiji/fiji
Reconstruct Reader: null transforms count as linear
Merge branch 'master' of https://github.com/fiji/fiji
Trainable Weka Segmentation: add Line roi support.
Trainable Weka Segmentation: extract methods to add training samples based on the different rois.
Merge branch 'trainable-seg-gui'
Trainable Weka Segmentation: remove e-mails from authors.
Merge branch 'master' into trainable-seg-gui
Trainable Weka Segmentation: added color support to entropy filter.