Changeset b006464 for protocols/nogaim.h


Ignore:
Timestamp:
2012-11-17T23:51:21Z (8 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
5aa96fc8
Parents:
d1356cb (diff), e1d3f98 (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 mainline.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • protocols/nogaim.h

    rd1356cb rb006464  
    9090        int permdeny;
    9191       
    92         char displayname[128];
    9392        char *away;
    94        
    95         int evil;
    9693       
    9794        /* BitlBee */
     
    129126        char show[BUDDY_ALIAS_MAXLEN];
    130127        int present;
    131         int evil;
    132128        time_t signon;
    133129        time_t idle;
Note: See TracChangeset for help on using the changeset viewer.