Changeset b006464 for protocols/nogaim.h

Timestamp:

2012-11-17T23:51:21Z (11 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:

• protocols/nogaim.h (modified) (2 diffs)

protocols/nogaim.h

@@ -90 +90 @@
         int permdeny;
         
-        char displayname[128];
         char *away;
-        
-        int evil;
         
         /* BitlBee */
@@ -129 +126 @@
         char show[BUDDY_ALIAS_MAXLEN];
         int present;
-        int evil;
         time_t signon;
         time_t idle;