[Debian-astro-commits] [gyoto] 65/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 40b3c77fd8868bb7ea519b9532068511e2a6a75a
Merge: 07ca4e0 c582a2e
Author: Thibaut Paumard <paumard at users.sourceforge.net>
Date:   Tue Oct 21 15:08:50 2014 +0200

    Merge branch 'stable'
    
    Conflicts:
    	NEWS

 NEWS | 4 ++++
 1 file changed, 4 insertions(+)

diff --cc NEWS
index 555d1c7,999b0d1..5ab3dd5
--- a/NEWS
+++ b/NEWS
@@@ -1,9 -1,6 +1,13 @@@
++<<<<<<< HEAD
 +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.3 2014/10/21 BUG
+ 	* Fix minor memory management bug in yotck/gyoto_Scenery.C
+ 
  0.2.2 2014/09/19 BUG
  	* Correct Metric:: and KerrBL::circularVelocity().
  

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