This is the merged version: http://www.squeaksource.com/ADayAtTheBeach/WebClient-Core-SvenVanCaekenbergh... ==================== Summary ==================== Name: WebClient-Core-SvenVanCaekenberghe.72 Author: SvenVanCaekenberghe Time: 25 August 2010, 5:22:16 pm UUID: 952161b4-521e-48fe-9338-ba90805327e3 Ancestors: WebClient-Core-StephaneDucasse.71, WebClient-Core-pmm.68 Merged changed contributed by Philippe Marschall 3 failures, 1 error; but these are different ones ;-) I guess these should be fixable, but I had little time. Now Andreas is already 3 version further (all committed yesterday) .... Sven On 25 Aug 2010, at 14:04, Stéphane Ducasse wrote:
On Aug 25, 2010, at 1:56 PM, Sven Van Caekenberghe wrote:
I was afraid you were going to ask that ;-)
but I'm easy going no :)
OK, I'll see what I can do later today. I'll have to read up a bit about MC merging. Like here http://www.lukas-renggli.ch/blog/monticello-merging ? Later on Philippe should maybe also have a look at what I did...
Philippe? else I will do it.
Stef _______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project