iiiypuk/hexchat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into wdk

Browse Source
This commit is contained in:
Berke Viktor 2011-11-23 03:19:13 +01:00
commit 845d8db211
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/perl/lib/Xchat.pod
View File

@ -723,7 +723,7 @@ Send multiple mode changes for the current channel. It may send multiple MODE li
Example: Example:
=begin html =begin html
<<div class="example"> <div class="example">
<code> <code>
use strict; use strict;
use warning; use warning;

10
plugins/perl/perl.c
View File

@ -1357,14 +1357,18 @@ perl_load_file (char *filename)
FreeLibrary (lib); FreeLibrary (lib);
lib = NULL; lib = NULL;
thread_mbox ("Cannot open " PERL_DLL "\n\n" thread_mbox ("Cannot open " PERL_DLL "\n\n"
"You must have Strawberry Perl " PERL_REQUIRED_VERSION " installed in order to\n" "You must have either ActivePerl or Straberry Perl"
PERL_REQUIRED_VERSION
" installed in order to\n"
"run perl scripts.\n\n" "run perl scripts.\n\n"
"I have found Perl 5.6, but that is too old."); "I have found Perl 5.6, but that is too old.");
} else { } else {
thread_mbox ("Cannot open " PERL_DLL "\n\n" thread_mbox ("Cannot open " PERL_DLL "\n\n"
"You must have Strawberry Perl " PERL_REQUIRED_VERSION " installed in order to\n" "You must have either ActivePerl or Strawberry Perl "
PERL_REQUIRED_VERSION " installed in order to\n"
"run perl scripts.\n\n" "run perl scripts.\n\n"
"http://strawberryperl.com\n\n" "http://www.activestate.com/ActivePerl/\n"
"http://strawberryperl.com/\n"
"Make sure perl's bin directory is in your PATH."); "Make sure perl's bin directory is in your PATH.");
} }
} }

2
plugins/perl/xchat2-perl.html
View File

@ -686,7 +686,7 @@ One is the original and the second is the one you emit.</p>
</ul> </ul>
<p>Send multiple mode changes for the current channel. It may send multiple MODE lines if the request doesn't fit on one.</p> <p>Send multiple mode changes for the current channel. It may send multiple MODE lines if the request doesn't fit on one.</p>
<p>Example:</p> <p>Example:</p>
<<div class="example synNormal"><div class='line_number'> <div class="example synNormal"><div class='line_number'>
<div>1</div> <div>1</div>
<div>2</div> <div>2</div>
<div>3</div> <div>3</div>