[visp-images] 05/07: Resolve conflicts taking new release changes

[Olivier Sallou]

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

osallou pushed a commit to branch master
in repository visp-images.

commit 558fab81e7bed0f393f353df300d731abc3b78ea
Merge: a7ae424 af5f19b
Author: Fabien Spindler <Fabien.Spindler at inria.fr>
Date:   Fri Dec 18 15:28:54 2015 +0100

    Resolve conflicts taking new release changes

 .DS_Store                  | Bin 6148 -> 0 bytes
 ChangeLog                  |  65 --------------------------------
 README                     |  68 ----------------------------------
 README.md                  |  37 +++++++++++++++++++
 mbt/cube.cao               |  34 ++++++++++-------
 mbt/cube.init              |  11 +++---
 mbt/cube.wrl               |   7 ++--
 mbt/cube.xml               |  90 ++++++++++++++++++++++-----------------------
 mbt/cube_and_cylinder.cao  |  41 ++++++++++++---------
 mbt/cube_and_cylinder.init |  11 +++---
 mbt/cube_and_cylinder.wrl  |  12 +++---
 mire/mire.jpg              | Bin
 12 files changed, 146 insertions(+), 230 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/visp-images.git