Diffusion MITK dc515c8e99db

Merge branch 'bug-7011-fix-lineendings'
dc515c8e99db
Actions

Description

Merge branch 'bug-7011-fix-lineendings'

Details

Provenance

nolden

Authored on Feb 23 2011, 4:46 PM

Parents

rMITK16924f224294: Fixed CRLF lineendings in repository
rMITKebd8625a13ab: Merge branch 'bug-6517-mitk-superbuild'

Branches

Unknown

Tags

Unknown

Event Timeline

nolden committed rMITKdc515c8e99db: Merge branch 'bug-7011-fix-lineendings' (authored by nolden).Feb 23 2011, 4:46 PM

Merged Changes

16924f224294 Fixed CRLF lineendings in repository
Author
nolden
Browse Repository
No Builds
No Audits

Changes (64)

Path

Size

Packages

BlueBerry/

Testing/

org.blueberry.core.runtime.tests/

META-INF/

MANIFEST.MF

BlueBerry2/

Bundles/

org.blueberry.core.jobs/

META-INF/

MANIFEST.MF

Testing/

org.blueberry.core.runtime.tests/

META-INF/

MANIFEST.MF

CMake/

QBundleTemplate/

project/

startAppTemplate.bat

O1: MITK Reviewer Group I

startVS2008Template.bat

O1: MITK Reviewer Group I

resources/

qtresources.qrc

O1: MITK Reviewer Group I

Core/

Code/

Testing/

mitkDicomSeriesReaderTest.cpp

Documentation/

Doxygen/

GeometryOverview.dox

Modules/

Bundles/

org.mitk.core.ext/

schema/

inputdevice.exsd

org.mitk.core.jobs/

META-INF/

MANIFEST.MF

resources/

.qrc

org.mitk.gui.qt.basicimageprocessing/

META-INF/

MANIFEST.MF

resources/

QmitkBasicImageProcessingView.qrc

org.mitk.gui.qt.colourimageprocessing/

META-INF/

MANIFEST.MF

resources/

QmitkColourImageProcessingView.qrc

org.mitk.gui.qt.deformableregistration/

META-INF/

MANIFEST.MF

resources/

QmitkDeformableRegistrationView.qrc

org.mitk.gui.qt.diffusionimaging/

META-INF/

MANIFEST.MF

org.mitk.gui.qt.extapplication/

resources/

QmitkExtApplication.qrc

org.mitk.gui.qt.igttoolpairnavigation/

META-INF/

MANIFEST.MF

resources/

QmitkToolPairNavigationView.qrc

org.mitk.gui.qt.imagenavigator/

META-INF/

MANIFEST.MF

resources/

QmitkImageNavigatorView.qrc

org.mitk.gui.qt.imagestatistics/

META-INF/

MANIFEST.MF

resources/

QmitkImageStatisticsView.qrc

org.mitk.gui.qt.materialeditor/

META-INF/

MANIFEST.MF

resources/

QmitkMITKSurfaceMaterialEditorView.qrc

org.mitk.gui.qt.pointbasedregistration/

META-INF/

MANIFEST.MF

org.mitk.gui.qt.pointsetinteraction/

META-INF/

MANIFEST.MF

org.mitk.gui.qt.python.console/

META-INF/

MANIFEST.MF

plugin.xml

resources/

QmitkPythonConsoleView.qrc

org.mitk.gui.qt.regiongrowing/

META-INF/

MANIFEST.MF

resources/

regiongrowing.qrc

org.mitk.gui.qt.rigidregistration/

META-INF/

MANIFEST.MF

resources/

QmitkRigidRegistrationView.qrc

org.mitk.gui.qt.segmentation/

META-INF/

MANIFEST.MF

org.mitk.inputdevices.spacenavigator/

META-INF/

MANIFEST.MF

org.mitk.inputdevices.wiimote/

META-INF/

MANIFEST.MF

IGT/

Testing/

Data/

ClaronTool

InputDevices/

WiiMote/

WiiMoteModel.obj

MitkExt/

Testing/

Data/

QmitkExt/

Utilities/

Poco/

CppUnit/

WinTestRunner/

res/

WinTestRunner.rc

ipPic/

doc/

ipPic.pdf

usingPic.pdf

Wrapping/

CSwig/

Python/

rMITKdc515c8e99db

View Options

BlueBerry/Testing/org.blueberry.core.runtime.tests/META-INF/MANIFEST.MF

View Options

BlueBerry2/Bundles/org.blueberry.core.jobs/META-INF/MANIFEST.MF

View Options

BlueBerry2/Testing/org.blueberry.core.runtime.tests/META-INF/MANIFEST.MF

View Options

CMake/QBundleTemplate/project/startAppTemplate.bat

View Options

CMake/QBundleTemplate/project/startVS2008Template.bat

View Options

CMake/QBundleTemplate/resources/qtresources.qrc

View Options

Core/Code/Testing/mitkDicomSeriesReaderTest.cpp

View Options

Documentation/Doxygen/GeometryOverview.dox

View Options

Modules/Bundles/org.mitk.core.ext/schema/inputdevice.exsd

View Options

Modules/Bundles/org.mitk.core.jobs/META-INF/MANIFEST.MF

View Options

Modules/Bundles/org.mitk.core.jobs/resources/.qrc

View Options

Modules/Bundles/org.mitk.gui.qt.basicimageprocessing/META-INF/MANIFEST.MF

View Options

Modules/Bundles/org.mitk.gui.qt.basicimageprocessing/resources/QmitkBasicImageProcessingView.qrc

View Options

Modules/Bundles/org.mitk.gui.qt.colourimageprocessing/META-INF/MANIFEST.MF

View Options

Modules/Bundles/org.mitk.gui.qt.colourimageprocessing/resources/QmitkColourImageProcessingView.qrc

View Options

Modules/Bundles/org.mitk.gui.qt.deformableregistration/META-INF/MANIFEST.MF

View Options

Modules/Bundles/org.mitk.gui.qt.deformableregistration/resources/QmitkDeformableRegistrationView.qrc

View Options

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/META-INF/MANIFEST.MF

View Options

Modules/Bundles/org.mitk.gui.qt.extapplication/resources/QmitkExtApplication.qrc

View Options

Modules/Bundles/org.mitk.gui.qt.igttoolpairnavigation/META-INF/MANIFEST.MF

View Options

Modules/Bundles/org.mitk.gui.qt.igttoolpairnavigation/resources/QmitkToolPairNavigationView.qrc

View Options

Modules/Bundles/org.mitk.gui.qt.imagenavigator/META-INF/MANIFEST.MF

View Options

Modules/Bundles/org.mitk.gui.qt.imagenavigator/resources/QmitkImageNavigatorView.qrc

View Options

Modules/Bundles/org.mitk.gui.qt.imagestatistics/META-INF/MANIFEST.MF

View Options

Modules/Bundles/org.mitk.gui.qt.imagestatistics/resources/QmitkImageStatisticsView.qrc

View Options

Modules/Bundles/org.mitk.gui.qt.materialeditor/META-INF/MANIFEST.MF

View Options

Modules/Bundles/org.mitk.gui.qt.materialeditor/resources/QmitkMITKSurfaceMaterialEditorView.qrc

View Options

Modules/Bundles/org.mitk.gui.qt.pointbasedregistration/META-INF/MANIFEST.MF

View Options

Modules/Bundles/org.mitk.gui.qt.pointsetinteraction/META-INF/MANIFEST.MF

View Options

Modules/Bundles/org.mitk.gui.qt.python.console/META-INF/MANIFEST.MF

View Options

Modules/Bundles/org.mitk.gui.qt.python.console/plugin.xml

View Options

Modules/Bundles/org.mitk.gui.qt.python.console/resources/QmitkPythonConsoleView.qrc

View Options

Modules/Bundles/org.mitk.gui.qt.regiongrowing/META-INF/MANIFEST.MF

View Options

Modules/Bundles/org.mitk.gui.qt.regiongrowing/resources/regiongrowing.qrc

View Options

Modules/Bundles/org.mitk.gui.qt.rigidregistration/META-INF/MANIFEST.MF

View Options

Modules/Bundles/org.mitk.gui.qt.rigidregistration/resources/QmitkRigidRegistrationView.qrc

View Options

Modules/Bundles/org.mitk.gui.qt.segmentation/META-INF/MANIFEST.MF

View Options

Modules/Bundles/org.mitk.inputdevices.spacenavigator/META-INF/MANIFEST.MF

View Options

Modules/Bundles/org.mitk.inputdevices.wiimote/META-INF/MANIFEST.MF

View Options

Modules/IGT/Testing/Data/ClaronTool

View Options

Modules/InputDevices/WiiMote/WiiMoteModel.obj

View Options

Modules/MitkExt/Testing/Data/lungs.vtk

View Options

Modules/MitkExt/Testing/Data/testNrrd.ascii

View Options

Modules/MitkExt/Testing/Data/testNrrd.nhdr

View Options

Modules/QmitkExt/btnClear.xpm

View Options

Modules/QmitkExt/btnClearAll.xpm

View Options

Modules/QmitkExt/btnCube.xpm

View Options

Modules/QmitkExt/btnCylinder.xpm

View Options

Modules/QmitkExt/btnDown.xpm

View Options

Modules/QmitkExt/btnEllipsoid.xpm

View Options

Modules/QmitkExt/btnLoad.xpm

View Options

Modules/QmitkExt/btnPyramid.xpm

View Options

Modules/QmitkExt/btnSave.xpm

View Options

Modules/QmitkExt/btnSetPoints.xpm

View Options

Modules/QmitkExt/btnSetSeedPoint.xpm

View Options

Modules/QmitkExt/btnUp.xpm

View Options

Utilities/Poco/CppUnit/WinTestRunner/res/WinTestRunner.rc

View Options

Utilities/ipPic/doc/ipPic.pdf

View Options

Utilities/ipPic/doc/usingPic.pdf

View Options

Wrapping/CSwig/Master.mdx.in

View Options

Wrapping/CSwig/Python/mitkbase.py.in

View Options

Wrapping/CSwig/SwigInc.txt.in

View Options

Wrapping/CSwig/mitk.swg

View Options

Wrapping/CSwig/mitkvtk.swg

Merge branch 'bug-7011-fix-lineendings'dc515c8e99dbActions

Description

Details

Event Timeline

Merged Changes

Changes (64)

rMITKdc515c8e99db

BlueBerry/Testing/org.blueberry.core.runtime.tests/META-INF/MANIFEST.MF

BlueBerry2/Bundles/org.blueberry.core.jobs/META-INF/MANIFEST.MF

BlueBerry2/Testing/org.blueberry.core.runtime.tests/META-INF/MANIFEST.MF

CMake/QBundleTemplate/project/startAppTemplate.bat

CMake/QBundleTemplate/project/startVS2008Template.bat

CMake/QBundleTemplate/resources/qtresources.qrc

Core/Code/Testing/mitkDicomSeriesReaderTest.cpp

Documentation/Doxygen/GeometryOverview.dox

Modules/Bundles/org.mitk.core.ext/schema/inputdevice.exsd

Modules/Bundles/org.mitk.core.jobs/META-INF/MANIFEST.MF

Modules/Bundles/org.mitk.core.jobs/resources/.qrc

Modules/Bundles/org.mitk.gui.qt.basicimageprocessing/META-INF/MANIFEST.MF

Modules/Bundles/org.mitk.gui.qt.basicimageprocessing/resources/QmitkBasicImageProcessingView.qrc

Modules/Bundles/org.mitk.gui.qt.colourimageprocessing/META-INF/MANIFEST.MF

Modules/Bundles/org.mitk.gui.qt.colourimageprocessing/resources/QmitkColourImageProcessingView.qrc

Modules/Bundles/org.mitk.gui.qt.deformableregistration/META-INF/MANIFEST.MF

Modules/Bundles/org.mitk.gui.qt.deformableregistration/resources/QmitkDeformableRegistrationView.qrc

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/META-INF/MANIFEST.MF

Modules/Bundles/org.mitk.gui.qt.extapplication/resources/QmitkExtApplication.qrc

Modules/Bundles/org.mitk.gui.qt.igttoolpairnavigation/META-INF/MANIFEST.MF

Modules/Bundles/org.mitk.gui.qt.igttoolpairnavigation/resources/QmitkToolPairNavigationView.qrc

Modules/Bundles/org.mitk.gui.qt.imagenavigator/META-INF/MANIFEST.MF

Modules/Bundles/org.mitk.gui.qt.imagenavigator/resources/QmitkImageNavigatorView.qrc

Modules/Bundles/org.mitk.gui.qt.imagestatistics/META-INF/MANIFEST.MF

Modules/Bundles/org.mitk.gui.qt.imagestatistics/resources/QmitkImageStatisticsView.qrc

Modules/Bundles/org.mitk.gui.qt.materialeditor/META-INF/MANIFEST.MF

Modules/Bundles/org.mitk.gui.qt.materialeditor/resources/QmitkMITKSurfaceMaterialEditorView.qrc

Modules/Bundles/org.mitk.gui.qt.pointbasedregistration/META-INF/MANIFEST.MF

Modules/Bundles/org.mitk.gui.qt.pointsetinteraction/META-INF/MANIFEST.MF

Modules/Bundles/org.mitk.gui.qt.python.console/META-INF/MANIFEST.MF

Modules/Bundles/org.mitk.gui.qt.python.console/plugin.xml

Modules/Bundles/org.mitk.gui.qt.python.console/resources/QmitkPythonConsoleView.qrc

Modules/Bundles/org.mitk.gui.qt.regiongrowing/META-INF/MANIFEST.MF

Modules/Bundles/org.mitk.gui.qt.regiongrowing/resources/regiongrowing.qrc

Modules/Bundles/org.mitk.gui.qt.rigidregistration/META-INF/MANIFEST.MF

Modules/Bundles/org.mitk.gui.qt.rigidregistration/resources/QmitkRigidRegistrationView.qrc

Modules/Bundles/org.mitk.gui.qt.segmentation/META-INF/MANIFEST.MF

Modules/Bundles/org.mitk.inputdevices.spacenavigator/META-INF/MANIFEST.MF

Modules/Bundles/org.mitk.inputdevices.wiimote/META-INF/MANIFEST.MF

Modules/IGT/Testing/Data/ClaronTool

Modules/InputDevices/WiiMote/WiiMoteModel.obj

Modules/MitkExt/Testing/Data/lungs.vtk

Modules/MitkExt/Testing/Data/testNrrd.ascii

Modules/MitkExt/Testing/Data/testNrrd.nhdr

Modules/QmitkExt/btnClear.xpm

Modules/QmitkExt/btnClearAll.xpm

Modules/QmitkExt/btnCube.xpm

Modules/QmitkExt/btnCylinder.xpm

Modules/QmitkExt/btnDown.xpm

Modules/QmitkExt/btnEllipsoid.xpm

Modules/QmitkExt/btnLoad.xpm

Modules/QmitkExt/btnPyramid.xpm

Modules/QmitkExt/btnSave.xpm

Modules/QmitkExt/btnSetPoints.xpm

Modules/QmitkExt/btnSetSeedPoint.xpm

Modules/QmitkExt/btnUp.xpm

Utilities/Poco/CppUnit/WinTestRunner/res/WinTestRunner.rc

Utilities/ipPic/doc/ipPic.pdf

Utilities/ipPic/doc/usingPic.pdf

Wrapping/CSwig/Master.mdx.in

Wrapping/CSwig/Python/mitkbase.py.in

Wrapping/CSwig/SwigInc.txt.in

Wrapping/CSwig/mitk.swg

Wrapping/CSwig/mitkvtk.swg

Merge branch 'bug-7011-fix-lineendings'
dc515c8e99db
Actions