[pLog-svn] r2128 - in plog/trunk: . bin-devel class class/action class/action/admin class/config class/controller class/dao class/dao/customfields class/data/validator class/database/adodb class/database/adodb/datadict class/database/adodb/docs c

[Oscar Renalias]

Wasn't it you who was asking me to merge it so that it could get some
attention/testing help? :)))

But whenever the testing happens, I think it could be a wise idea to
let you do the merging... Not because I cannot do it, but because I am
afraid we're going to get a lot of conflicts and you're the one who
can best solve them!

Oscar

On 5/31/05, Benjamin Krause <ork at orkland.de> wrote:
> you should not merge the 1.1-ben branch anytime soon :)
> 
> 
> Oscar Renalias wrote:
> > just finished merging 1.0.1 with the trunk. It wasn't that difficult
> > but there were a few conflicts... If you decide to upgrade to 1.1 and
> > notice any problems, either fix them or let me know :) (but just be
> > aware that there could be problems!)
> >
> > Oscar
> > _______________________________________________
> > pLog-svn mailing list
> > pLog-svn at devel.plogworld.net
> > http://devel.plogworld.net/mailman/listinfo/plog-svn
>