summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNiklas Haas <git@nand.wakku.to>2015-04-27 23:02:40 +0200
committerDiogo Franco (Kovensky) <diogomfranco@gmail.com>2015-04-28 08:34:05 +0900
commit1eb7db70d5583802898064e3c26b95298a17fc5a (patch)
treebb681c6686ee4d22d2418b99a1bf3f61cf4e1cdc
parenta8c764acb487267d2f806b03f22d742e2628e621 (diff)
downloadmpv-1eb7db70d5583802898064e3c26b95298a17fc5a.tar.bz2
mpv-1eb7db70d5583802898064e3c26b95298a17fc5a.tar.xz
manpage: update mpv IRC channels
Moved to #mpv and #mpv-devel, respectively. Travis details were also updated. (cherry picked from commit d2292c179c62fed462acf7ae428c0ba8a26ef07e)
-rw-r--r--.travis.yml2
-rw-r--r--DOCS/contribute.md4
-rw-r--r--README.md4
3 files changed, 5 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index dab4b6d631..d7f7e6fdfd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -47,7 +47,7 @@ notifications:
email: false
irc:
channels:
- - "irc.freenode.org#mpv-player-dev"
+ - "irc.freenode.org#mpv-devel"
on_success: change
on_failure: always
diff --git a/DOCS/contribute.md b/DOCS/contribute.md
index 11b5e33d50..19563e90c5 100644
--- a/DOCS/contribute.md
+++ b/DOCS/contribute.md
@@ -4,8 +4,8 @@ How to contribute
General
-------
-The main contact for mpv development is IRC, specifically #mpv-player
-and #mpv-player-dev on Freenode.
+The main contact for mpv development is IRC, specifically #mpv
+and #mpv-devel on Freenode.
Sending patches
---------------
diff --git a/README.md b/README.md
index 4f8676552f..bb3dd71316 100644
--- a/README.md
+++ b/README.md
@@ -175,8 +175,8 @@ Most activity happens on the IRC channel and the github issue tracker. The
mailing lists are mostly unused.
- **Github issue tracker**: [issue tracker][issue-tracker] (report bugs here)
- - **User IRC Channel**: `#mpv-player` on `irc.freenode.net`
- - **Developer IRC Channel**: `#mpv-player-dev` on `irc.freenode.net`
+ - **User IRC Channel**: `#mpv` on `irc.freenode.net`
+ - **Developer IRC Channel**: `#mpv-devel` on `irc.freenode.net`
- **Users Mailing List**: `mpv-users@googlegroups.com` ([Archive / Subscribe][mpv-users]).
- **Devel Mailing List**: `mpv-devel@googlegroups.com` ([Archive / Subscribe][mpv-devel])