Re: libgtop merging

[Bastien Nocera <hadess hadess net>]

On Sun, 2003-10-19 at 15:36, Carlos Perelló Marín wrote:
> El vie, 17-10-2003 a las 16:55, Kevin Vandersloot escribió:
> > On Fri, 17 Oct 2003, Bastien Nocera wrote:
> > 
> > Just to mention (not volunteering), that this is not quite so simple to do 
> > since libgtop-GNOME-2-0-port branch was made from the libgtop stable 
> > branch and not from HEAD. HEAD changed quite a bit (including directory 
> > structure) so it's not just a simple merge and look for conflicts here.
> 
> Then, we could do just a copy from libgtop-GNOME-2-0-port branch to
> HEAD, couldn't we? (or the HEAD branch has any useful code that we
> should merge into libgtop-GNOME-2-0-port branch code?)

We can mash HEAD. If you want to do the move, go have a try at it ;)

---
Bastien Nocera <hadess hadess net> 
Her face was a perfect oval, like a circle that had its two other sides
gently compressed by a Thigh Master.