On Tue, Dec 17, 2013 at 11:35 AM, Geoffrey Irving <[email protected]> wrote: > On Sat, Dec 14, 2013 at 4:57 PM, Matthew Knepley <[email protected]> wrote: >> On Sat, Dec 14, 2013 at 2:02 PM, Geoffrey Irving <[email protected]> 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). Geoffrey
