summaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
authorDr. Chat <arkolbed@gmail.com>2018-05-05 17:11:18 -0500
committerDr. Chat <arkolbed@gmail.com>2018-05-05 17:13:09 -0500
commit53be87f6ba4008ff01d0811d29602606b250045d (patch)
tree51f1ddb04be0b4087abdc24bae4ec3721e325b8b /README.md
parentc5dbcc7e80bfa6b859a13799baf540495fec63d4 (diff)
parent30f8fe7bb0d02bf1e09ec139e97c1a4d51defde8 (diff)
Merge mastertexsplit
Diffstat (limited to 'README.md')
-rw-r--r--README.md8
1 files changed, 4 insertions, 4 deletions
diff --git a/README.md b/README.md
index e1b752425..6cd1b873c 100644
--- a/README.md
+++ b/README.md
@@ -4,11 +4,11 @@ Xenia - Xbox 360 Emulator Research Project
Xenia is an experimental emulator for the Xbox 360. For more information see the
[main xenia website](http://xenia.jp/).
-Come chat with us about **emulator-related topics** in
-[#xenia @ irc.freenode.net](http://webchat.freenode.net?channels=%23xenia&uio=MTE9NzIaa).
-For developer chat join `#xenia-dev` but stay on topic. Lurking is fine.
+Come chat with us about **emulator-related topics** on [Discord](https://discord.gg/Q9mxZf9).
+For developer chat join `#dev` but stay on topic. Lurking is fine.
Please check the [frequently asked questions](http://xenia.jp/faq/) page before
asking questions. We've got jobs/lives/etc, so don't expect instant answers.
+
Discussing illegal activities will get you banned. No warnings.
## Status
@@ -16,7 +16,7 @@ Discussing illegal activities will get you banned. No warnings.
Buildbot | Status
-------- | ------
[Windows](https://ci.appveyor.com/project/benvanik/xenia/branch/master) | [![Build status](https://ci.appveyor.com/api/projects/status/ftqiy86kdfawyx3a/branch/master?svg=true)](https://ci.appveyor.com/project/benvanik/xenia/branch/master)
-[Linux](https://travis-ci.org/benvanik/xenia) | [![Build status](https://travis-ci.org/benvanik/xenia.svg)](https://travis-ci.org/benvanik/xenia)
+[Linux](https://travis-ci.org/xenia-project/xenia) | [![Build status](https://travis-ci.org/xenia-project/xenia.svg)](https://travis-ci.org/xenia-project/xenia)
Some real games run. Most don't.
See the [Game compatibility list](https://github.com/xenia-project/game-compatibility/issues)