[simbody] 01/01: Merge branch 'upstream' into dfsg_clean

[Jose Luis Rivero]

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

jrivero-guest pushed a commit to branch dfsg_clean
in repository simbody.

commit e05369dcf79e9e72188a72aed68474174cee6c93
Merge: 96f7360 bad65f6
Author: Jose Luis Rivero <jrivero at osrfoundation.org>
Date:   Tue Jan 17 17:37:49 2017 +0000

    Merge branch 'upstream' into dfsg_clean

 CHANGELOG.md                                      |  8 +++-
 CMakeLists.txt                                    |  2 +-
 README.md                                         |  6 +--
 SimTKcommon/include/SimTKcommon/internal/Timing.h | 38 ++++++++++++++++++-
 SimTKcommon/src/Timing.cpp                        | 22 ++++++-----
 appveyor.yml                                      | 46 -----------------------
 6 files changed, 60 insertions(+), 62 deletions(-)

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