aboutsummaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
authorarchshift <admin@archshift.com>2014-04-28 19:44:43 -0700
committerarchshift <admin@archshift.com>2014-04-28 19:44:43 -0700
commit237d079aad97aefcddc991157bf3ac50aa64b7f6 (patch)
treecad4e7082fb3c97ecf9d8a6818722308154aa76a /README.md
parent5a9c2ce5ea1b272d73001acaf9ec15f1c0e5e041 (diff)
parent5a3d9b8e6183ad92fa1bd19b5fe981bab131d3b5 (diff)
Merge commit upstream/master into issue-7-fix
Diffstat (limited to 'README.md')
-rw-r--r--README.md4
1 files changed, 3 insertions, 1 deletions
diff --git a/README.md b/README.md
index 862175201..832b647bd 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,8 @@
citra emulator
==============
-An experimental open-source Nintendo 3DS emulator/debugger written in C++. At this time, it only emulates a very small subset of 3DS hardware, and therefore is only useful for booting/debugging very simple homebrew demos. Citra is licensed under the GPLv2. Refer to the license.txt file included.
+[![Travis CI Build Status](https://travis-ci.org/bunnei/citra.svg)](https://travis-ci.org/bunnei/citra)
+
+An experimental open-source Nintendo 3DS emulator/debugger written in C++. At this time, it only emulates a very small subset of 3DS hardware, and therefore is only useful for booting/debugging very simple homebrew demos. Citra is licensed under the GPLv2. Refer to the license.txt file included. Please read the [FAQ](https://github.com/bunnei/citra/wiki/FAQ) before getting started with the project.
For development discussion, please join us @ #citra on [freenode](http://webchat.freenode.net/).