Skip to content

Commit

Permalink
Merge pull request eduardolundgren#89 from mairatma/master
Browse files Browse the repository at this point in the history
Better description for the color fishtank demo
  • Loading branch information
eduardolundgren committed Jul 30, 2014
2 parents 1a1b4a7 + f916421 commit 1149c9c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion examples/color_camera.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
</head>
<body>
<div class="demo-title">
<p><a href="http://trackingjs.com" target="_parent">tracking.js</a>get user's webcam and detect colors</p>
<p><a href="http://trackingjs.com" target="_parent">tracking.js</a>choose the colors you want to detect through the controls on the right</p>
</div>

<div class="demo-frame">
Expand Down
2 changes: 1 addition & 1 deletion examples/color_fish_tank.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
</head>
<body>
<div class="demo-title">
<p><a href="http://trackingjs.com" target="_parent">tracking.js</a>get user's webcam and detect colors to control the scene</p>
<p><a href="http://trackingjs.com" target="_parent">tracking.js</a>use a magenta colored object to control the scene</p>
</div>

<video id="video" width="320" height="240" preload autoplay loop muted></video>
Expand Down

0 comments on commit 1149c9c

Please sign in to comment.