Merge remote-tracking branch 'origin/master' into track-mate
f09fcbe5f88a
Actions

Authored by Jean-Yves Tinevez <jean-yves.tinevez@pasteur.fr> on Aug 2 2013, 11:03.

Description

Merge remote-tracking branch 'origin/master' into track-mate

Conflicts:
.mailmap
README.md
plugins/Scripts/File/Make_Screencast.bsh
pom.xml
src-plugins/SPIM_Registration/src/main/java/mpicbg/spim/fusion/MappingFusionSequentialDifferentOutput.java
src-plugins/SPIM_Registration/src/main/java/mpicbg/spim/registration/ViewDataBeads.java
src-plugins/fiji-compat/src/main/java/fiji/User_Plugins.java

Signed-off-by: Jean-Yves Tinevez <jean-yves.tinevez@pasteur.fr>

Details

Committed

Jean-Yves Tinevez <jean-yves.tinevez@pasteur.fr>

Aug 2 2013, 11:03

Pushed

oburri

Mar 8 2018, 18:06

Parents

R6269:18d95da596f3: Colocalization Analysis (unit tests): do not expect test data to be present
R6269:e9e15a14ead1: Merge remote-tracking branch 'origin/master' into track-mate

Branches

Unknown

Tags

Unknown

Event Timeline

Jean-Yves Tinevez <jean-yves.tinevez@pasteur.fr> committed R6269:f09fcbe5f88a: Merge remote-tracking branch 'origin/master' into track-mate (authored by Jean-Yves Tinevez <jean-yves.tinevez@pasteur.fr>).Aug 2 2013, 11:03

Merged Changes

Commit	Author	Details	Committed
18d95da596f3	Johannes Schindelin	Colocalization Analysis (unit tests): do not expect test data to be present	Jul 24 2013
af40ae019487	Johannes Schindelin	Colocalization Analysis (unit tests): move two forgotten classes	Jul 24 2013
7600141de61f	Johannes Schindelin	Move all unit tests into the appropriate src/test/java/	Jul 24 2013
f575bdf11c17	Johannes Schindelin	Fix scope of all those JUnit dependencies	Jul 23 2013

Changes (25)

		Path
M		pom.xml
D		src/main/java/tests
V		src/{main → test}/java/tests/ColocalisationTest.java
V		src/{main → test}/java/tests/CostesSignificanceTest.java
V		src/{main → test}/java/tests/ImprovedNoise.java
V		src/{main → test}/java/tests/LiICQTest.java
V		src/{main → test}/java/tests/MandersColocalizationTest.java
V		src/{main → test}/java/tests/MaskAndRoiTest.java
V		src/{main → test}/java/tests/PearsonsCorrelationTest.java
V		src/{main → test}/java/tests/SpearmanRankTest.java
V		src/{main → test}/java/tests/StatisticsTest.java
V		src/{main → test}/java/tests/TestImageAccessor.java
A	(dir)	src/test/
A	(dir)	src/test/java/
A	(dir)	src/test/java/tests/
V		src/{test ← main}/java/tests/ColocalisationTest.java
V		src/{test ← main}/java/tests/CostesSignificanceTest.java
V		src/{test ← main}/java/tests/ImprovedNoise.java
V		src/{test ← main}/java/tests/LiICQTest.java
V		src/{test ← main}/java/tests/MandersColocalizationTest.java
V		src/{test ← main}/java/tests/MaskAndRoiTest.java
V		src/{test ← main}/java/tests/PearsonsCorrelationTest.java
V		src/{test ← main}/java/tests/SpearmanRankTest.java
V		src/{test ← main}/java/tests/StatisticsTest.java
V		src/{test ← main}/java/tests/TestImageAccessor.java

Merge remote-tracking branch 'origin/master' into track-matef09fcbe5f88aActions

Description

Details

Event Timeline

Merged Changes

Changes (25)

R6269:f09fcbe5f88a

pom.xml

src/main/java/tests

src/main/java/tests/ColocalisationTest.java

src/main/java/tests/CostesSignificanceTest.java

src/main/java/tests/ImprovedNoise.java

src/main/java/tests/LiICQTest.java

src/main/java/tests/MandersColocalizationTest.java

src/main/java/tests/MaskAndRoiTest.java

src/main/java/tests/PearsonsCorrelationTest.java

src/main/java/tests/SpearmanRankTest.java

src/main/java/tests/StatisticsTest.java

src/main/java/tests/TestImageAccessor.java

src/test/java/tests/ColocalisationTest.java

src/test/java/tests/CostesSignificanceTest.java

src/test/java/tests/ImprovedNoise.java

src/test/java/tests/LiICQTest.java

src/test/java/tests/MandersColocalizationTest.java

src/test/java/tests/MaskAndRoiTest.java

src/test/java/tests/PearsonsCorrelationTest.java

src/test/java/tests/SpearmanRankTest.java

src/test/java/tests/StatisticsTest.java

src/test/java/tests/TestImageAccessor.java

Merge remote-tracking branch 'origin/master' into track-mate
f09fcbe5f88a
Actions