Page MenuHomePhabricator

Merge revert commits from release branch into master
Closed, ResolvedPublic

Description

During the 2013-06 release a bad merge was done. The commits of this merge have been reverted on the branch releases/2013-06. Since some bugfixes may base on this branch these revert commits will most likely get into the master at some point. We decided to merge them into the master and fix the issue separately.

Event Timeline

fetzer added a subscriber: fetzer.

New remote branch pushed: bug-15532-merge-revert-commits

[3e44b1]: Merge branch 'bug-15532-merge-revert-commits'

Merged commits:

2013-06-28 13:52:23 Andreas Fetzer [ec8b69]
Revert "Added RenderingTest for tilted MRI."

This reverts commit f91320988a6317f45cf6d0dc311d2ee06b79672d.


2013-06-28 13:52:01 Andreas Fetzer [b389f4]
Revert "Added rendering test performing a reinit."

This reverts commit 433b66c8454bd8ef38f1b621111abf456faf86fb.


2013-06-28 13:51:56 Andreas Fetzer [29bd18]
Revert "COMP fixed wrong declaration of rendering testhelper"

This reverts commit df7462aaeef929a1cf2bd74838ade853c253e258.


2013-06-28 13:50:12 Andreas Fetzer [0d5410]
Revert "COMP Deactivating rendering test temporarily"

This reverts commit 201f9c9b204b911e2ff78f5532afbd0d9a374716.


2013-06-28 13:47:31 Andreas Fetzer [16f761]
Revert "COMP: Fixed usage of non bounding geometries for reslicing"

This reverts commit 53c9b5473c90edb3f89a6e5f8771f2a9df40899e.


2013-06-28 13:47:19 Andreas Fetzer [1bcad4]
Revert "Always use transform of image."

This reverts commit fc038ebbfad10ed7ccc9b80b8d2950b686f873f4.


2013-06-28 13:47:06 Andreas Fetzer [f0e787]
Revert "Redesign use of image transform."

This reverts commit d423f6e9a1815a3b2320b2f4eb9b0fe9d8d37e53.


2013-06-28 13:46:54 Andreas Fetzer [20ef81]
Revert "Removed function SetResliceTransformByGeometry."

This reverts commit 266455b27c8039264510b1f37dd8f9349480ad3f.


2013-06-28 13:46:34 Andreas Fetzer [4fa594]
Revert "Marked function deprecated."

This reverts commit 4b660c9ed3e2a649ddcb8eea26c2f87d9ebe827d.


2013-06-28 13:42:34 Andreas Fetzer [9b5406]
Revert "Fixed warning for clang compilers"

This reverts commit ca85df8b2d51b7cc09864b0011ef470a345101e9.

Conflicts:

Core/Code/Algorithms/mitkExtractSliceFilter.h