Re: libgtop merging

[Bastien Nocera <hadess hadess net>]

On Sun, 2003-10-19 at 18:05, Carlos Perelló Marín wrote:
> El dom, 19-10-2003 a las 17:26, Bastien Nocera escribió:
> > 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 ;)
> 
> Done, please, just test it.

GNOME 2.4 version is in the gnome-2-4 branch. I'm starting to clean up
HEAD.

Cheers

---
Bastien Nocera <hadess@hadess.net> 
Even in his last years, Granddad had a mind like a steel trap, only one
that had been left out so long it had rusted shut.