Diffusion MITK a5d1b0292ca8

resolved conflicts in QmiktXnatEditor Download
a5d1b0292ca8
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

resolved conflicts in QmiktXnatEditor Download

Details

Provenance

Authored on Apr 21 2015, 11:37 AM

Parents

rMITK06f189ec90b2: Use "Name" property for identifying the file to be downloaded. The "ID"…
rMITKe0f25db8d090: Merge branch 'bug-18853-delete-commented-out-code'

Branches

Unknown

Tags

Unknown

Event Timeline

• knorr committed rMITKa5d1b0292ca8: resolved conflicts in QmiktXnatEditor Download (authored by • knorr).Apr 21 2015, 11:37 AM

Merged Changes

06f189ec90b2 Use "Name" property for identifying the file to be downloaded. The "ID"…
Author
• fetzer
Browse Repository
No Builds
No Audits
60f3c528368e Added missing "/" to download path which could lead to problems during…
Author
• fetzer
Browse Repository
No Builds
No Audits
2d2753b82215 Merge branch 'bug-18051-UseMicroServicesForXnatSession'
Author
• fetzer
Browse Repository
No Builds
No Audits

Changes (2)

Path

Size

Packages

Plugins/

org.mitk.gui.qt.xnat/

src/

internal/

QmitkXnatConnectionPreferencePage.cpp

O3: MITK Reviewer Group II

QmitkXnatEditor.cpp

O3: MITK Reviewer Group II

rMITKa5d1b0292ca8

Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatConnectionPreferencePage.cpp

Loading...

Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatEditor.cpp

Loading...