[Debian-astro-commits] [gyoto] 02/03: 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 f59274dbcdc503cdaccf62c0f5b1027b30f3bcaa
Merge: de260fe 752026d
Author: Thibaut Paumard <paumard at users.sourceforge.net>
Date:   Sat May 23 09:35:15 2015 +0200

    Merge branch 'master' into debian

 doc/Makefile.in             |  2 +-
 include/GyotoConfig.h.in    |  9 +++++++++
 include/GyotoRegister.h     |  4 ++--
 lib/Makefile.am             |  2 +-
 lib/Makefile.in             |  2 +-
 lib/Register.C              |  3 +--
 lib/gyoto-uninstalled.pc.in | 12 ++++++------
 lib/gyoto.pc.in             |  9 +++++----
 python/Makefile.in          |  1 +
 9 files changed, 27 insertions(+), 17 deletions(-)

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