Merge remote-tracking branch 'upstream/master'

Conflicts: README.md
hyades · Sep 30, 2013 · a7a707d · a7a707d
2 parents bdf23c6 + f1d4343
commit a7a707d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/README b/README
@@ -2,5 +2,5 @@ GstSwitch
 
 This project is intended to be a replacement of DV-switch base on GStreamer.
 
-See README.md.
+See README.md
 
diff --git a/README.md b/README.md
@@ -1,13 +1,12 @@
 # Build Status
-[![Build Status](https://travis-ci.org/hyades/gst-switch.png?branch=master)](https://travis-ci.org/hyades/gst-switch)
-[![Coverage Status](https://coveralls.io/repos/hyades/gst-switch/badge.png?branch=master)](https://coveralls.io/r/hyades/gst-switch?branch=master)
+[![Build Status](https://travis-ci.org/timvideos/gst-switch.png?branch=master)](https://travis-ci.org/timvideos/gst-switch)
+[![Coverage Status](https://coveralls.io/repos/timvideos/gst-switch/badge.png)](https://coveralls.io/r/timvideos/gst-switch)
 
 # gst-switch
 ## Purpose
 This project is intended tog be a replacement of DV-switch base on GStreamer.
 ##Installing gst-switch
 ```bash
-# preferred method
 wget https://raw.github.com/timvideos/gst-switch/master/scripts/install2.sh
 chmod +x install2.sh
 ./install2.sh
@@ -88,4 +87,4 @@ gst-switch-cap --device='/dev/ttyUSB0' --protocol='visca'
 Implements Pan-Tilt-Zoom Camera
 ```bash
 gst-switch-ptz --device='/dev/ttyUSB0' --protocol='visca' --video='/dev/video0'
-```
+```