[Debian-astro-commits] [gyoto] 01/04: Merge branch 'master' into debian

[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 35a13db09f3ec8341bf5141bf433623abf1b4b3c
Merge: d8b7021 603f961
Author: Thibaut Paumard <paumard at users.sourceforge.net>
Date:   Sat May 23 13:57:07 2015 +0200

    Merge branch 'master' into debian

 .gitignore                  | 2 +-
 include/GyotoAstrobj.h      | 2 +-
 include/GyotoObject.h       | 4 ++--
 include/GyotoSpectrometer.h | 6 +++---
 python/numpy.i              | 2 +-
 yorick/gyoto_Astrobj.C      | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

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