On 09/10/2009 01:00 AM, Tim Moore wrote:
 
> so I'm not touching that. Instead, it looks like "Two-parameter physics-based
> model of atmosphere up to 262,467 ft i.e. the top of the mesosphere. Correctly
> exhibits the HALT phenomenon." would be awesome to have and is relatively
> independent of the rest of sportmodel. So, I have split out just that 
> changeset
> and merged it to my next branch (basically CVS HEAD). I've pushed the result
> to the jsd/environment branch in git://repo.or.cz/flightgear.git. Could you
> take a look and see if this merge is correct, especially with respect to the
> live_update stuff that was introduced since you made your changes? Before
> this is checked in to CVS I'd like to see if Unpack.hxx can be replaced with
> Boost tuples, but otherwise the code looks good.

I've had another go at this. I forgot to check some stuff in last night,
incorporated some changes from John, and reworked the way I did the merge. 
Here's
the summary:
My repo, viewable at http://repo.or.cz/w/flightgear.git, clonable from
git://repo.or.cz/flightgear.git

There are three relevant branches:
jsd/atmos - John's atmosphere patch, described above, with some cleanup
topic/atmos-merge - The results of merging that into our sources. This is what 
you should
   look at and run.
sportmodel - A manually maintained mirror of John's sportmodel fgs repo.

Please take a look. Barring negative feedback I'll check this into CVS soon.

Tim

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day 
trial. Simplify your report design, integration and deployment - and focus on 
what you do best, core application coding. Discover what's new with 
Crystal Reports now.  http://p.sf.net/sfu/bobj-july
_______________________________________________
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel

Reply via email to