Ignore:
Timestamp:
2015-11-21T00:01:50Z (8 years ago)
Author:
dequis <dx@…>
Parents:
e4f08bf (diff), 8fdeaa5 (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 feat/hip-cat

File:
1 edited

Legend:

Unmodified
Added
Removed

  • protocols/oscar/aim.h

    re4f08bf r29ff5c2  
    871871 * SNAC Family: Internal Messages
    872872 *
    873  * This isn't truely a SNAC family either, but using
     873 * This isn't truly a SNAC family either, but using
    874874 * these, we can integrated non-SNAC services into
    875875 * the SNAC-centered libfaim callback structure.
Note: See TracChangeset for help on using the changeset viewer.