9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Automated merge with ssh://hg.atheme.org//hg/charybdis

Browse source
This commit is contained in:
William Pitcock 2008-08-17 07:53:32 -05:00
commit 5c68d54336
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/numeric.h
View file

@ -154,6 +154,8 @@ extern const char *form_str(int);
#define RPL_LISTEND 323 #define RPL_LISTEND 323
#define RPL_CHANNELMODEIS 324 #define RPL_CHANNELMODEIS 324
#define RPL_CHANNELURL 328 /* to be sent by services */
#define RPL_CREATIONTIME 329 #define RPL_CREATIONTIME 329
#define RPL_WHOISLOGGEDIN 330 #define RPL_WHOISLOGGEDIN 330

1
include/s_conf.h
View file

@ -134,7 +134,6 @@ struct config_file_entry
const char *xlinefile; const char *xlinefile;
const char *resvfile; const char *resvfile;
char *servlink_path;
char *egdpool_path; char *egdpool_path;
char *default_operstring; char *default_operstring;

2
src/messages.tab
View file

@ -349,7 +349,7 @@ static const char * replies[] = {
/* 325 */ NULL, /* 325 */ NULL,
/* 326 */ NULL, /* 326 */ NULL,
/* 327 */ NULL, /* 327 */ NULL,
/* 328 */ NULL, /* 328 RPL_CHANNELURL */ NULL,
/* 329 RPL_CREATIONTIME, */ ":%s 329 %s %s %lu", /* 329 RPL_CREATIONTIME, */ ":%s 329 %s %s %lu",
/* 330 RPL_WHOISLOGGEDIN */ ":%s 330 %s %s %s :is logged in as", /* 330 RPL_WHOISLOGGEDIN */ ":%s 330 %s %s %s :is logged in as",
/* 331 RPL_NOTOPIC, */ ":%s 331 %s %s :No topic is set.", /* 331 RPL_NOTOPIC, */ ":%s 331 %s %s :No topic is set.",