summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rwxr-xr-x.travis-deps.sh3
-rw-r--r--README.md2
2 files changed, 2 insertions, 3 deletions
diff --git a/.travis-deps.sh b/.travis-deps.sh
index 567a2543d..8538098c1 100755
--- a/.travis-deps.sh
+++ b/.travis-deps.sh
@@ -28,7 +28,6 @@ if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then
fi
elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
- brew update > /dev/null # silence the very verbose output
- brew unlink cmake || true
+ brew update
brew install cmake qt5 sdl2 dylibbundler
fi
diff --git a/README.md b/README.md
index 5463763ad..13919a37d 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
Citra Emulator
==============
-[![Travis CI Build Status](https://travis-ci.org/citra-emu/citra.svg)](https://travis-ci.org/citra-emu/citra)
+[![Travis CI Build Status](https://travis-ci.org/citra-emu/citra.svg?branch=master)](https://travis-ci.org/citra-emu/citra)
[![AppVeyor CI Build Status](https://ci.appveyor.com/api/projects/status/sdf1o4kh3g1e68m9?svg=true)](https://ci.appveyor.com/project/bunnei/citra)
Citra is an experimental open-source Nintendo 3DS emulator/debugger written in C++. It is written with portability in mind, with builds actively maintained for Windows, Linux and OS X. Citra only emulates a subset of 3DS hardware, and therefore is generally only useful for running/debugging homebrew applications. At this time, Citra is even able to boot several commercial games! Most of these do not run to a playable state, but we are working every day to advance the project forward.