[Adium-devl] Libpurple isn't actually updated

[Evan Schoenberg]

On Apr 14, 2009, at 11:09 AM, Zachary West wrote:

> Now I'm getting:
>
> libpurple/protocols/Makefile.am:3: required directory
> libpurple/protocols/toc does not exist
>
> It looks like that directory doesn't exist. Removing it from the
> subdirectories path in libpurple/Makefile.am seems to make the build
> continue as intended. Is this the right fix?

It is; it was a merge error, as we had modified Makefile.am to add  
facebook, upstream modified to remove toc, and I chose the wrong thing  
during 3-way merge.

I fixed it yesterday but forgot to push the change.  Doing so now (and  
if you already did it, we'll just issue mtn merge to have the solution  
with a single head).

-Evan
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://adium.im/pipermail/devel_adium.im/attachments/20090414/94295a54/attachment-0001.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: PGP.sig
Type: application/pgp-signature
Size: 194 bytes
Desc: This is a digitally signed message part
URL: <http://adium.im/pipermail/devel_adium.im/attachments/20090414/94295a54/attachment.sig>