# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1382603591 -7200
# Node ID f27923072afda7a15fc2705d8b3bf4c82c77f079
# Parent  60d90e48e809c9e2aac119ad8444fbbc74eb2398# Parent  b1a0990ad40c34eb2e559211c0c086477a378aaf
merge

diff -r 60d90e48e809 -r f27923072afd OrthancServer/main.cpp
diff -r 60d90e48e809 -r f27923072afd Resources/Configuration.json