> If you want all of them you should be able to cherry-pick the commits _in > order_ or, alternatively, you could just checkout the final state of the > files from master as you suggested above.
I can't cherry-pick them no matter what order I try. Basically I want commit 0b8c17ba7437cb09c40c375419b36e38446d1b64 Author: Thorsten Renk <thorsten.i.r...@jyu.fi> Date: Wed Feb 6 13:48:45 2013 +0200 Bugfix for water flickering problem in Atmospheric Light Scattering commit dd678c2f8c5613fc600d88fae9faad3a516b5bc0 Author: Thorsten Renk <thorsten.i.r...@jyu.fi> Date: Mon Feb 4 14:52:14 2013 +0200 Bugfix for lower quality water shader in Atmospheric Light Scattering which should be equivalent to getting Effects/water.eff Shaders/water_lightfield.frag Shaders/water_lightfield_lr.frag from the master branch. I can check them out fine, but I just discovered I can't actually test that the changes run fine without building a release binary as well - so this grows over my head rather quickly... > I'm happy to do mechanical work here (and have been, in general), but I > can't separate inter-dependant commits when picking, only the author can > / should do that. I would much appreciate if you could take care of the issue, and also of commit 25bffb0d2344549dbb1647a2965fac275891da6d Author: Thorsten Renk <thorsten.i.r...@jyu.fi> Date: Mon Feb 4 15:19:58 2013 +0200 Bugfix for airport grass shader which is equivalent of just checking out Shaders/airfield.frag from master. Thanks, * Thorsten ------------------------------------------------------------------------------ Free Next-Gen Firewall Hardware Offer Buy your Sophos next-gen firewall before the end March 2013 and get the hardware for free! Learn more. http://p.sf.net/sfu/sophos-d2d-feb _______________________________________________ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel