[poppler] xpdf303 merge "finished"

[Albert Astals Cid]

El Dilluns, 6 de febrer de 2012, a les 01:21:05, Albert Astals Cid va 
escriure:
> El Dilluns, 6 de febrer de 2012, a les 00:36:36, Albert Astals Cid va
> 
> escriure:
> > I've just pushed the last bit of stuff we needed to merge into the
> > xpdf303merge branch.
> > 
> > Hurrray, big congrats to Thomas, Carlos and me for making it possible.
> > 
> > Now the problem is that we kept developing in master and it does not
> > merge cleanly :D
> > 
> > Now (or maybe tomorrow european afternoon) i'm going to merge trunk into
> > xpdf303merge branches so that we have two branches that have the same of
> > our features but one has the new features and improvements of xpdf303
> > and the other not.
> 
> I've just finished merging trunk into xpdf303merge.
> 
> Please start testing now and report anything you find ASAP. If noone
> complains by tuesday 14 I'll copy/merge xpdf303merge into trunk.

Aaaaaaaaaaaaaaand it's merged.

Albert

> 
> Cheers,
>   Albert
> 
> > Once that happens, we'll have a "regtesting week" so that everyone runs
> > the regtest and check if he can see any big obvious regression. If that
> > does not happen, we'll merge back xpdf303merge into trunk and cross our
> > fingers ;-) (Joking we've been already doing regtesting and we mostly
> > already know everything is the same or better)
> > 
> > Cheers,
> > 
> >   Albert
> > 
> > _______________________________________________
> > poppler mailing list
> > poppler at lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/poppler
> 
> _______________________________________________
> poppler mailing list
> poppler at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/poppler