[med-svn] [odil] 02/03: Merge tag 'upstream/0.4.1'

[Julien Lamy]

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

lamy-guest pushed a commit to branch master
in repository odil.

commit 3841799a05c4c9de9b747979a9a1425b674cced2
Merge: 77c7945 58ab0eb
Author: Julien Lamy <lamy at unistra.fr>
Date:   Sun Feb 28 16:08:48 2016 +0100

    Merge tag 'upstream/0.4.1'
    
    Upstream version 0.4.1

 .travis.yml           | 23 +++++++++++++++++------
 CMakeLists.txt        |  2 +-
 src/odil/base64.cpp   |  2 +-
 tests/code/base64.cpp | 25 +++++++++++++++++++++++++
 4 files changed, 44 insertions(+), 8 deletions(-)

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