Merge branch 'master' into regularized-affineregularized-affine
commit7a807f4cf32594d4aa95f90173b5dedf55103013
authorStephan Saalfeld <saalfeld@mpi-cbg.de>
Thu, 14 Jun 2012 14:32:16 +0000 (14 16:32 +0200)
committerStephan Saalfeld <saalfeld@mpi-cbg.de>
Thu, 14 Jun 2012 14:32:16 +0000 (14 16:32 +0200)
treed1105f8372c789c35299628b31e250d675c8a975
parenta0d0bdf8ee9594914a0a0d9fbe850da3c794302a
parent1c4be2d2366b6759cd3ff102a4beaacc97dc3ffd
Merge branch 'master' into regularized-affine
mpicbg/trakem2/align/AlignTask.java