Ignore:
Timestamp:
2016-09-24T20:14:34Z (8 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Children:
ba52ac5
Parents:
63cad66 (diff), 82cb190 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' into parson

File:
1 edited

Legend:

Unmodified
Added
Removed

  • protocols/oscar/aim.h

    r63cad66 r3fbce97  
    2121
    2222#include "bitlbee.h"
     23
     24#ifdef WITH_PURPLE
     25/* For compatibility with builds that include both purple and this oscar module */
     26#include "aim_prefixes.h"
     27#endif
    2328
    2429/* XXX adjust these based on autoconf-detected platform */
    … …  
    871876 * SNAC Family: Internal Messages
    872877 *
    873  * This isn't truely a SNAC family either, but using
     878 * This isn't truly a SNAC family either, but using
    874879 * these, we can integrated non-SNAC services into
    875880 * the SNAC-centered libfaim callback structure.
Note: See TracChangeset for help on using the changeset viewer.