Hi Julien, On 27 October 2017 at 14:57, Robert Osfield <robert.osfi...@gmail.com> wrote:
> There is a conflict on this change that github is reporting: > > https://github.com/openscenegraph/OpenSceneGraph/pull/374 > I have done another review of the changes and in particular the conflict, I've worked out the cause of the conflict and how to merge. The PR is now merged with the osganimation branch. Robert.
_______________________________________________ osg-users mailing list osg-users@lists.openscenegraph.org http://lists.openscenegraph.org/listinfo.cgi/osg-users-openscenegraph.org
