[med-svn] [mia] 01/01: Update merge

[Gert Wollny]

This is an automated email from the git hooks/post-receive script.

gert-guest pushed a commit to branch upstream
in repository mia.

commit 399a42203f4207a2977339d929855fd55d99a4c7
Merge: ff8c50c 397384e
Author: Gert Wollny <gw.fossdev at gmail.com>
Date:   Sun Jul 24 23:33:53 2016 +0200

    Update merge

 mia/3d/CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --cc mia/3d/CMakeLists.txt
index 77e8e65,d06a487..c8c34cc
--- a/mia/3d/CMakeLists.txt
+++ b/mia/3d/CMakeLists.txt
@@@ -115,10 -115,10 +115,10 @@@ SET(MIA3D_HEADER
    orientation.hh
    ppmatrix.hh
    quaternion.hh
-   register.hh
+ #  register.hh
    rigidregister.hh
    rot.hh
 -  shape.hh 
 +  shape.hh
    similarity_profile.hh
    stackdisttrans.hh
    splinetransformpenalty.hh

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/mia.git