In message <[EMAIL PROTECTED]>
Adam Blokus <[EMAIL PROTECTED]> wrote:
> As you can see - the plans for the first three weeks are quite determined,
> but
> the time of the latter two is flexible and open for your ideas and
> propositions - let me know if any of you has any requests :)
Hi Adam,
One important thing : it is merge time. I was about to do it myself together
with a final runover of your changes for far but the gtk/res/netsurf.glade
file gave a full merge clash because of your r4421 change and I'm not up
to resolve that myself. So could you do the merge from trunk to
your branch and resolve whatever is needed so that we can do the merge
from your branch to trunk more easily ?
Thanks,
John.
--
John Tytgat
[EMAIL PROTECTED]
