[openmeca] 01/04: Merge tag 'upstream/2.1.7'

[Damien André]

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

damien-andre-guest pushed a commit to branch master
in repository openmeca.

commit bae3f065b85480c1269102f8d700cb9774133e40
Merge: e7fff8d 4a4cefc
Author: Damien André <damien.andre at unilim.fr>
Date:   Sat Jan 28 06:56:37 2017 +0100

    Merge tag 'upstream/2.1.7'
    
    Upstream version 2.1.7

 .gitignore                                         |  51 ++++++++
 Makefile                                           |  57 +++++----
 README.md                                          |  12 +-
 .../collision/bullet/LinearMath/btSerializer.cpp   |   4 +-
 SRC/OpenMeca/Info.txt                              |   2 +-
 SRC/OpenMeca/Rsc/Img/OpenMeca.icns                 | Bin 1745036 -> 404731 bytes
 SRC/OpenMeca/Rsc/Img/OpenMeca_1024.png             | Bin 0 -> 131098 bytes
 debian/changelog                                   |   6 -
 debian/compat                                      |   1 -
 debian/control                                     |  19 ---
 debian/copyright                                   | 133 ---------------------
 debian/docs/openmeca.1                             |  16 ---
 debian/openmeca.desktop                            |   9 --
 debian/openmeca.install                            |   4 -
 debian/openmeca.manpages                           |   1 -
 debian/openmeca.xml                                |   7 --
 debian/rules                                       |   7 --
 debian/source/format                               |   1 -
 debian/watch                                       |   3 -
 19 files changed, 97 insertions(+), 236 deletions(-)

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