Diffusion MITK e136b189a0ab

Merge branch 'bug-9669-NavigationDataPlayerBase'
e136b189a0ab
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge branch 'bug-9669-NavigationDataPlayerBase'

Conflicts:
Modules/IGT/IGTFilters/mitkNavigationDataPlayer.cpp

Details

Provenance

Authored on Nov 4 2011, 5:13 PM

Parents

rMITK279627121eb4: Merge branch 'Branch_9a6b707fa78ba79def47434af4958fc736a4c395' into bug-9669…
rMITK08141e33471e: Merge branch 'bug-8957-rename-non-unique-labels'

Branches

Unknown

Tags

Unknown

Event Timeline

franza committed rMITKe136b189a0ab: Merge branch 'bug-9669-NavigationDataPlayerBase' (authored by franza).Nov 4 2011, 5:13 PM

Merged Changes

279627121eb4 Merge branch 'Branch_9a6b707fa78ba79def47434af4958fc736a4c395' into bug-9669…
Author
franza
Browse Repository
No Builds
No Audits
597d82dbd562 Moved members and getters StreamValid and ErrorMessage to…
Author
franza
Browse Repository
No Builds
No Audits

Changes (5)

Path

Size

Modules/

IGT/

IGTFilters/

mitkNavigationDataPlayer.cpp

mitkNavigationDataPlayer.h

mitkNavigationDataPlayerBase.cpp

mitkNavigationDataPlayerBase.h

mitkNavigationDataSequentialPlayer.cpp

rMITKe136b189a0ab

Modules/IGT/IGTFilters/mitkNavigationDataPlayer.cpp

Loading...

Modules/IGT/IGTFilters/mitkNavigationDataPlayer.h

Loading...

Modules/IGT/IGTFilters/mitkNavigationDataPlayerBase.cpp

Loading...

Modules/IGT/IGTFilters/mitkNavigationDataPlayerBase.h

Loading...

Modules/IGT/IGTFilters/mitkNavigationDataSequentialPlayer.cpp

Loading...