On Sun, Jun 14, 2015 at 08:58:10PM -0700, Dirk Hohndel wrote: > On Sun, Jun 14, 2015 at 05:33:35PM -1000, Gaetan Bisson wrote: > > > > Would it be possible to merge the recent changes made to upstream > > libdivecomputer [1] into Subsurface's custom libdc [2]? > > Yes, in the Subsurface-testing branch (and this will be a force push > because I prefer to rebase my changes on top of Jef's changes - this makes > it much easier if Jef wants to look at what we are changing compared to > hist master). > > I usually don't update the release related branches of libdivecomputer - > or do you need the Subsurface-4.4 branch updated as well? > > > > It looks like a straightforward merge, but please let me know if there > > is anything I could do to help; I would be happy to. > > I need to apply Linus' changes as well. Let me take a look and see how it > goes.
As expected, no problems at all. Subsurface-testing branch is updated with the latest master from Jef and the last patches from Linus for the EON Steel. Let me know if you need anything else. /D _______________________________________________ subsurface mailing list [email protected] http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
