[Debian-astro-commits] [gyoto] 63/221: Merge branch 'stable'

[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 07ca4e07717e68f535f6c1abfff4c46f83a60d49
Merge: 97a0e08 a2ddb8e
Author: Thibaut Paumard <paumard at users.sourceforge.net>
Date:   Tue Oct 21 15:05:52 2014 +0200

    Merge branch 'stable'
    
    Conflicts:
    	NEWS

 ChangeLog              | 34 +++++++++++++++++++++++++++++++++-
 NEWS                   |  3 +++
 yorick/gyoto_Scenery.C |  5 ++---
 3 files changed, 38 insertions(+), 4 deletions(-)

diff --cc NEWS
index c4977cd,0d41a44..555d1c7
--- a/NEWS
+++ b/NEWS
@@@ -1,9 -1,6 +1,12 @@@
 +next future ABI 3
 +   * New functionality: MPI-based parallelisation
 +   * Change Scenery::rayTrace() API, replacing i/jmin and max with a
 +     new concept Screen::Coord2dSet. This allows using the same
 +     code-path for both the gyoto utility and all the yorick use cases.
 +
+ 0.2.2 2014/09/19 BUG
+ 	* Correct Metric:: and KerrBL::circularVelocity().
+ 
  0.2.1 2014/07/22 ABI 2.1
  	* ABI is backward compatible with 0.2.0.
  	* Support for the special values DBL_MAX, DBL_MIN, -DBL_MAX

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