Merge branch 'master' into spring-mesh2
tree4ad2e4c464251172d520f4ed55584f2face5132a
-rw-r--r-- 47 .gitignore
-rw-r--r-- 2149 .mailmap
-rw-r--r-- 11819 DownsamplerTest.java
-rw-r--r-- 659 README
drwxr-xr-x - T2-NIT
drwxr-xr-x - T2-TreelineGraph
-rw-r--r-- 748 TODO
-rw-r--r-- 521 TODO.ElasticAlign
drwxr-xr-x - TrakEM2_
drwxr-xr-x - VectorString
-rwxr-xr-x 42 grep
-rw-r--r-- 1498 pom.xml
drwxr-xr-x - test