Merge branches 'feature/bingtrans' and 'develop' into develop

This commit is contained in:
neersighted 2012-03-02 20:05:23 -08:00
commit 9a66001c8d
3 changed files with 3 additions and 3 deletions

View file

@ -104,7 +104,7 @@ CloudBot is **licensed** under the **GPL v3** license. The terms are as follows.
CloudBot/DEV
Copyright © 2011 Luke Rogers <http://www.dempltr.com/> - <lukeroge@gmail.com>
Copyright © 2011 ClouDev <http://cloudev.github.com/> - <cloudev@neersighted.com>
CloudBot is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by

View file

@ -5,7 +5,7 @@ echo " / ____/ /___ __ ______/ / __ )____ / /_"
echo " / / / / __ \/ / / / __ / __ / __ \/ __/"
echo "/ /___/ / /_/ / /_/ / /_/ / /_/ / /_/ / /_ "
echo "\____/_/\____/\__,_/\__,_/_____/\____/\__/ "
echo " http://git.io/cloudbot by lukeroge "
echo " http://git.io/cloudbot by ClouDev "
echo ""
locatefiles() {
botfile="/bot.py"

View file

@ -1,4 +1,4 @@
# MyGengo translation plugin by lukeroge and neersighted
# BING translation plugin by lukeroge and neersighted
from util import hook
from util import http
import re