Merge branch 'integral' of ssh://repo.or.cz/srv/git/trakem2 into integral
treeb4002af520b98d0376612c67de176e8c43c16900
-rw-r--r-- 62 .gitignore
-rw-r--r-- 6799 DownsamplerTest.java
-rw-r--r-- 851 Fakefile
-rw-r--r-- 993 Makefile
-rw-r--r-- 659 README
-rw-r--r-- 748 TODO
-rw-r--r-- 521 TODO.ElasticAlign
-rw-r--r-- 1560 build.xml
drwxr-xr-x - bunwarpj
-rwxr-xr-x 170 c_sift_plugin
-rwxr-xr-x 338 c_vib
-rw-r--r-- 19 excludes
-rwxr-xr-x 42 grep
drwxr-xr-x - img
-rwxr-xr-x 97 info.sh
drwxr-xr-x - ini
-rwxr-xr-x 455 jar_it
-rwxr-xr-x 748 jdoc
drwxr-xr-x - lenscorrection
drwxr-xr-x - lineage
drwxr-xr-x - mpi
drwxr-xr-x - mpicbg
-rw-r--r-- 117 nit.trakem2
-rw-r--r-- 840 plugins.config
drwxr-xr-x - test
-rw-r--r-- 133 treeline-graph.trakem2
drwxr-xr-x - treeline