Changeset 0fb32dd for irc.h


Ignore:
Timestamp:
2015-04-06T17:07:03Z (6 years ago)
Author:
dequis <dx@…>
Children:
1aacef41
Parents:
b3ebb3a (diff), a9b1e0e (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 'develop' into feat/hip-cat

Conflicts:

irc.h
irc_channel.c

File:
1 edited

Legend:

Unmodified
Added
Removed
  • irc.h

    rb3ebb3a r0fb32dd  
    302302void irc_channel_name_strip(char *name);
    303303int irc_channel_name_cmp(const char *a_, const char *b_);
    304 char *irc_channel_name_gen(bee_t *bee, const char *name);
     304char *irc_channel_name_gen(irc_t *irc, const char *name);
    305305gboolean irc_channel_name_hint(irc_channel_t *ic, const char *name);
    306306void irc_channel_update_ops(irc_channel_t *ic, char *value);
Note: See TracChangeset for help on using the changeset viewer.