Merge remote-tracking branch 'origin/releases/snapshot-CGS-Workbench-2015.05' into releases/snapshot-CGS-Workbench-2015.05
Conflicts:
Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatSessionManager.cpp
Description
Description
Details
Details
- Provenance
• fetzer Authored on Nov 11 2015, 11:52 AM - Parents
- rMITKfcfd246e0794: Added possibility to set http proxy for XNAT connections
rMITKab3496301df4: Use proxy settings of the system when connecting to XNAT - Branches
- Unknown
- Tags
Merged Changes
Merged Changes