Merge branch 'master' of https://github.com/supertuxkart/stk-code

2016-03-09 16:47:13 +11:00
parent 1923ba0ab4 8ba337c343
commit 058c1554ac
2 changed files with 2858 additions and 2860 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -47,7 +47,7 @@ script:
 notifications:
  irc:
    channels:
-      - "irc.freenode.org#stk"
+      - "irc.freenode.org#supertuxkart"
    skip_join: false
    use_notice: true
    template:
--- a/data/po/supertuxkart.pot
+++ b/data/po/supertuxkart.pot