[pLog-svn] trunk merging

[Oscar Renalias]

Regarding strings.txt, we should just take the newest version or else
we'll lose the changes again.

Regarding wizard.php, both changes should be kept as they are related
to something we forgot to do when upgrading LT 1.0 to LT 1.1.x.

On 12/19/06, Jon Daley <plogworld at jon.limedaley.com> wrote:
> I assume the template/strings file is out-of-date, and doesn't matter.
> The wizard change might be important?
>
> On Mon, 18 Dec 2006, Jon Daley wrote:
> > Need lifetype-1.1.1
> > 4100:HEAD
>
> svn merge -r4100:HEAD http://devel.lifetype.net/svn/plog/plog/branches/lifetype-1.1.1
>
> C    wizard.php    -- see below, not sure what to do with this
> C    templates/LifeType/en_UK/strings.txt   -- probably doesn't matter
>
> ~/www/plog>svn log -r 4100:HEAD --verbose wizard.php
> ------------------------------------------------------------------------
> r4123 | oscar | 2006-10-12 04:03:33 -0400 (Thu, 12 Oct 2006) | 2 lines
> Changed paths:
>     M /plog/branches/lifetype-1.1.1/wizard.php
>
> fix for issue 1079 (http://bugs.lifetype.net/view.php?id=1079) -- we
> forgot to set the file_size field of resources when upgrading from 1.0 to
> 1.1.
>
> ------------------------------------------------------------------------
> r4124 | oscar | 2006-10-12 04:09:39 -0400 (Thu, 12 Oct 2006) | 2 lines
> Changed paths:
>     A /plog/branches/lifetype-1.1.1/templates/wizard/update111.template
>     M /plog/branches/lifetype-1.1.1/wizard.php
>
> the previous fix didn't quite work as expected...
>
> _______________________________________________
> pLog-svn mailing list
> pLog-svn at devel.lifetype.net
> http://devel.lifetype.net/mailman/listinfo/plog-svn
>