# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1464689579 -7200
# Node ID 2fffa4d0f313c954a70eae566093c87c372c2e14
# Parent  f6c88aa6efe0712ef3b6ce0c4632ddf581a5a102# Parent  69477d40afe95f99ebbed4e247f0da048318c7e3
merge

diff -r f6c88aa6efe0 -r 2fffa4d0f313 Orthanc/Core/Images/ImageProcessing.cpp
diff -r f6c88aa6efe0 -r 2fffa4d0f313 WebApplication/images/orthanc-icon.png
Binary file WebApplication/images/orthanc-icon.png has changed
diff -r f6c88aa6efe0 -r 2fffa4d0f313 WebApplication/images/orthanc-logo.png
Binary file WebApplication/images/orthanc-logo.png has changed