Merge branch 'master' into intensity-transform
treedd7a681ea7b211b712b843d4c6ed43b0fc84e5f6
-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-- 1406 pom.xml
drwxr-xr-x - test