[poppler] xpdf303 merge "finished"

[Albert Astals Cid]

El Diumenge, 5 de febrer de 2012, a les 19:32:50, James Cloos va escriure:
> >>>>> "AAC" == Albert Astals Cid <aacid at kde.org> writes:
> AAC> Now (or maybe tomorrow european afternoon) i'm going to merge trunk
> AAC> into xpdf303merge
> 
> Perhaps it would be best to create a new branch based on xpdf303merge
> and merge master into that, rather than merging directly into xpdf303merge.
> 
> Alternatively, create a annodated tag of xpdf303merge before the merge,
> and another after.
> 
> Either way will make it easier to analyze things.

As you can see from reading my other e-mail, you're late.

Albert

> 
> -JimC