Patches good to merge.

[Dirk Hohndel]

On Wed, May 14, 2014 at 10:51:10PM -0300, Tomaz Canabrava wrote:
> So, I was looking at the profile today to port stuff the planner to
> the new profile, but I couldn't, I was just fixing stuff that I looked
> at there ( while I was thinking how to port the planner to the new
> profile ), so no work was lost. :)
> 
> The 0002 and 0011 patches disables / reenables the planner ( as I
> tougth at the beginning that I was just going to port it and not fix
> anything... silly me. )

Obviously I didn't take those two patches, nor did I take the ones that
didn't apply to master (either now or before I pushed all the changes made
on the boat). My guess is that you have some other planner code pulled
into your tree that aren't in master.

And I didn't take the patch that in all caps pointed out that you didn't
know what you were doing :-)

> I think tomorrow I'll start really porting the planner as those other
> patches kept me busy.
> 
> Dirk, please take a good look at the patches, as I don't program for
> subsurface for quite a while, see if I didn't messed anything. ;)

So five went in. And they went in under heavy cursing as you clearly lost
all your settings for indentation and whitespace. I had to edit every
single patch (I think).

Tomaz, we went through this before. It's NOT HARD. But it makes my life as
a maintainer a pain. PLEASE. Comply with our whitespace rules. 

/D