diff options
| author | Wilmer van der Gaast <wilmer@gaast.net> | 2010-10-02 19:45:26 -0700 | 
|---|---|---|
| committer | Wilmer van der Gaast <wilmer@gaast.net> | 2010-10-02 19:45:26 -0700 | 
| commit | 8e9e2b7d9e54744cee32b3724391bf0ad04e8aff (patch) | |
| tree | 6cafdc57bb8143306daf8ef8288d09754f39b451 /protocols/msn/tables.c | |
| parent | 88de0c96136313e553113f69cfc6ae544a5f5954 (diff) | |
| parent | 2af3e232ff468b288dd4e0dbdab1a17312d801c5 (diff) | |
Merging mainline, which includes a huge msnp13 merge.
Not 100% sure about the OpenSSL merge, should double check that but I'm
currently offline.
Diffstat (limited to 'protocols/msn/tables.c')
| -rw-r--r-- | protocols/msn/tables.c | 4 | 
1 files changed, 3 insertions, 1 deletions
| diff --git a/protocols/msn/tables.c b/protocols/msn/tables.c index 42b12aa9..273d291e 100644 --- a/protocols/msn/tables.c +++ b/protocols/msn/tables.c @@ -1,7 +1,7 @@    /********************************************************************\    * BitlBee -- An IRC to other IM-networks gateway                     *    *                                                                    * -  * Copyright 2002-2004 Wilmer van der Gaast and others                * +  * Copyright 2002-2010 Wilmer van der Gaast and others                *    \********************************************************************/  /* MSN module - Some tables with useful data                            */ @@ -82,6 +82,8 @@ const struct msn_status_code msn_status_code_list[] =  	{ 229, "Group name too long",                                   0 },  	{ 230, "Cannot remove that group",                              0 },  	{ 231, "Invalid group",                                         0 }, +	{ 240, "ADL/RML command with corrupted payload",                STATUS_FATAL }, +	{ 241, "ADL/RML command with invalid modification",             0 },  	{ 280, "Switchboard failed",                                    STATUS_SB_FATAL },  	{ 281, "Transfer to switchboard failed",                        0 }, | 
