[petsc-dev] merge requests to next
Matthew Knepley
knepley at gmail.com
Wed Dec 18 19:25:52 CST 2013
On Wed, Dec 18, 2013 at 7:23 PM, Geoffrey Irving <irving at naml.us> wrote:
> On Tue, Dec 17, 2013 at 11:35 AM, Geoffrey Irving <irving at naml.us> wrote:
> > On Sat, Dec 14, 2013 at 4:57 PM, Matthew Knepley <knepley at gmail.com>
> wrote:
> >> On Sat, Dec 14, 2013 at 2:02 PM, Geoffrey Irving <irving at naml.us>
> wrote:
> >>>
> >>> Thanks Matt for merging them! I'll switch to pull requests in future.
> >>
> >> I have merged doc and ex12. I need to cleanup dual-space since there was
> >> some unmerged stuff from me that was flattened by a rebase-gone-wrong.
> >
> > Great, thanks. I'm not sure if the rebase-gone-wrong was me or you;
> > if it was me, let me know if I should clean something up.
>
> In case it helps, I just rebased irving/dual-space-context on top of
> master (and adjusted the DMDA functions accordingly).
Great. I will merge it tomorrow.
Thanks
Matt
>
> Geoffrey
>
--
What most experimenters take for granted before they begin their
experiments is infinitely more interesting than any results to which their
experiments lead.
-- Norbert Wiener
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mcs.anl.gov/pipermail/petsc-dev/attachments/20131218/286172fd/attachment.html>
More information about the petsc-dev
mailing list