adam/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-08-07 01:13:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.6.x'

Browse Source 
Conflicts:
    .travis.yml
This commit is contained in:
Alexey Sokolov
2015-10-16 23:31:31 +01:00
parent c87a40ac9b 0022fc6162
commit 0d21471b74
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
+4 -5
View File
@@ -3,6 +3,7 @@ env:
global:
- secure: "i2f2UVDnyHT/9z0U3XvgTj8eDERvnc1Wk7HpseEjb75JwGzqn/2R+RKHmoSrwK3hFgij2IMxZL19XtHFwMz9t5A/huAAKD74KMMI/QpeZEJ/sjT3CTLcE9HEVDdJOjc7dfLRxb2hZtgvx8clZIMrpeUdPhci8openff30KvXVbg="
matrix:
fast_finish: true
include:
- os: linux
compiler: gcc
@@ -32,13 +33,9 @@ before_install:
install:
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then cat /proc/cpuinfo /proc/meminfo; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then lsb_release -a; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; fi # for gcc-4.8
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo add-apt-repository -y ppa:teward/swig3.0; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo add-apt-repository -y ppa:teward/icu-backports; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get update; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install libperl-dev python3-dev tcl-dev libsasl2-dev libicu-dev swig3.0 doxygen graphviz python3-setuptools socat; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install g++-4.8; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" && "$CXX" == "g++" ]]; then export CXX="g++-4.8" CC="gcc-4.8"; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo easy_install3 pexpect; fi
- |
if [[ "$TRAVIS_OS_NAME" == "linux" && "$BUILD_TYPE" == "coverage" ]]; then
@@ -96,6 +93,8 @@ after_success:
notifications:
irc:
channels:
- "irc.freenode.net#znc"
- "irc.freenode.net#znc-dev"
on_success: always
on_failure: always
sudo: required
dist: trusty
modules/perform.cpp
+5 -5
View File
@@ -90,13 +90,13 @@ public:
MODCONSTRUCTOR(CPerform) {
AddHelpCommand();
AddCommand("Add", static_cast<CModCommand::ModCmdFunc>(&CPerform::Add),
"<command>");
"<command>", "Adds perform command to be sent to the server on connect");
AddCommand("Del", static_cast<CModCommand::ModCmdFunc>(&CPerform::Del),
"<number>");
AddCommand("List", static_cast<CModCommand::ModCmdFunc>(&CPerform::List));
AddCommand("Execute", static_cast<CModCommand::ModCmdFunc>(&CPerform::Execute));
"<number>", "Delete a perform command");
AddCommand("List", static_cast<CModCommand::ModCmdFunc>(&CPerform::List),"", "List the perform commands");
AddCommand("Execute", static_cast<CModCommand::ModCmdFunc>(&CPerform::Execute),"", "Send the perform commands to the server now");
AddCommand("Swap", static_cast<CModCommand::ModCmdFunc>(&CPerform::Swap),
"<number> <number>");
"<number> <number>", "Swap two perform commands");
}
virtual ~CPerform() {}