[Debian-astro-commits] [gyoto] 06/221: Merge branch 'master' of github-paumard:gyoto/Gyoto

[Thibaut Jean-Claude Paumard]

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

thibaut pushed a commit to branch master
in repository gyoto.

commit e55f953edc10690ed3902f302b3b1f7509d80239
Merge: 5f85ee5 98ddf27
Author: Thibaut Paumard <paumard at users.sourceforge.net>
Date:   Wed Sep 3 15:11:16 2014 +0200

    Merge branch 'master' of github-paumard:gyoto/Gyoto

 include/GyotoAstrobj.h         |   7 +
 include/GyotoDirectionalDisk.h |   2 +
 include/GyotoDynamicalDisk3D.h |   1 +
 include/GyotoPolishDoughnut.h  |  53 +++-
 lib/Astrobj.C                  |  69 +++--
 lib/DirectionalDisk.C          | 144 ++++++---
 lib/DynamicalDisk3D.C          | 154 ++++++----
 lib/Photon.C                   |   6 +-
 lib/PolishDoughnut.C           | 663 +++++++++++++++++++++++++++--------------
 9 files changed, 749 insertions(+), 350 deletions(-)

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