[Pharo-project] About webclient.ppm.73

2010-08-27 Thread stephane ducasse
hi philippe

I wanted to integrate it in 1.2 but I have 5 conflicts. Should I juste load?
Is it for 1.2?

Stef

___
Pharo-project mailing list
Pharo-project@lists.gforge.inria.fr
http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project


Re: [Pharo-project] About webclient.ppm.73

2010-08-27 Thread Philippe Marschall
On 08/27/2010 10:22 AM, stephane ducasse wrote:
 hi philippe
 
 I wanted to integrate it in 1.2 but I have 5 conflicts. Should I juste load?
 Is it for 1.2?

No, it's not. Do you have WebClient already in 1.2 and are trying to
merge against it? If so I can have a look at it.

Cheers
Philippe


___
Pharo-project mailing list
Pharo-project@lists.gforge.inria.fr
http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project


Re: [Pharo-project] About webclient.ppm.73

2010-08-27 Thread Stéphane Ducasse

On Aug 27, 2010, at 3:45 PM, Philippe Marschall wrote:

 On 08/27/2010 10:22 AM, stephane ducasse wrote:
 hi philippe
 
 I wanted to integrate it in 1.2 but I have 5 conflicts. Should I juste load?
 Is it for 1.2?
 
 No, it's not. Do you have WebClient already in 1.2 and are trying to
 merge against it? If so I can have a look at it.

yes we have it in 1.2
and sven merged your changes but it would be great if you can have a look

 
 Cheers
 Philippe
 
 
 ___
 Pharo-project mailing list
 Pharo-project@lists.gforge.inria.fr
 http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project


___
Pharo-project mailing list
Pharo-project@lists.gforge.inria.fr
http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project