[aquaria] massive pile of patches now in icculus tree...

[Dustin Voss]

No, I’ll take care of it. Everything in the repo is done, but the public repo does not have all the recent changes. I have got them in locally, though. It is still in branches, but it shouldn’t be two hard to combine ’em all up. I can then push it to the public repo; I guess you want it that way?


On May 3, 2011, at 6:18 PM, Ryan C. Gordon wrote:

> 
>> Sure. What should I do with the head? E-mail the link, or send a patch?
> 
> I guess a better question would be: is there anything in your repo I _shouldn't_ take in (anything that's only halfway complete, etc)?
> 
> Pulling from your repo sort of makes a giant spiderweb of branches, and doesn't currently merge cleanly to the tip, but I'm not against pulling it in, piece by piece, where it makes sense to do so.
> 
> --ryan.
> 
> _______________________________________________
> aquaria mailing list
> aquaria at icculus.org
> http://icculus.org/mailman/listinfo/aquaria