[Debian-astro-commits] [gyoto] 113/221: Merge branch 'master' into introspection

[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 68db7c5e23e9aac253d2b1ad891ba48629874578
Merge: 714d24b a8b849a
Author: Thibaut Paumard <paumard at users.sourceforge.net>
Date:   Wed Nov 26 23:11:01 2014 +0100

    Merge branch 'master' into introspection

 lib/Photon.C | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


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