Merge branch 'master' into wdk

2012-05-04 19:23:07 +02:00
parent 3c983b106b cba2e2e360
commit eeed2c3da0
3 changed files with 7 additions and 2 deletions
--- a/plugins/perl/lib/Xchat.pod
+++ b/plugins/perl/lib/Xchat.pod
@ -869,6 +869,8 @@ if( Xchat::context_info->{flags} &amp; (1 << 6) ) {
                     1 - server<br />
                     2 - channel<br />
                     3 - dialog<br />
+                     4 - notices<br />
+                     5 - server notices<br />
                     </td>
   </tr>

--- a/plugins/perl/xchat2-perl.html
+++ b/plugins/perl/xchat2-perl.html
@ -806,6 +806,8 @@ if there is no such list.</p>
                     1 - server<br />
                     2 - channel<br />
                     3 - dialog<br />
+                     4 - notices<br />
+                     5 - server notices<br />
                     </td>
   </tr>   <tr>
      <td>users</td> <td>Number of users in this channel</td>