Changeset 2288705 for irc.h


Ignore:
Timestamp:
2009-12-07T21:54:19Z (10 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
1c3008a
Parents:
aac4017 (diff), 36cf9fd (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:

Merging head.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • irc.h

    raac4017 r2288705  
    3838#define CMODE "t"
    3939#define UMODE "s"
     40#define CTYPES "&#"
    4041
    4142typedef enum
     
    4748        USTATUS_SHUTDOWN = 8
    4849} irc_status_t;
    49 
    50 typedef struct channel
    51 {
    52         char *name;
    53 } channel_t;
    5450
    5551typedef struct irc
     
    8884        struct account *accounts;
    8985        GSList *file_transfers;
     86        struct chat *chatrooms;
    9087       
    9188        struct __USER *users;
     
    10198
    10299#include "user.h"
    103 // #include "nick.h"
    104100
    105101extern GSList *irc_connection_list;
Note: See TracChangeset for help on using the changeset viewer.