Merge branch 'master' of github.com:processing/p5.js

Lauren McCarthy · Lauren McCarthy · commit ab5843cfb19b · 2016-12-05T13:25:55.000-08:00
diff --git a/src/color/creating_reading.js b/src/color/creating_reading.js
@@ -140,7 +140,7 @@ p5.prototype.brightness = function(c) {
  * @param  {Number|String} gray    number specifying value between white
  *                                 and black.
  * @param  {Number}        [alpha] alpha value relative to current color range
- *                                 (default is 0-100)
+ *                                 (default is 0-255)
  * @return {Array}                 resulting color
  *
  * @example

Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ p5.prototype.brightness = function(c) {`
`140`	`140`	`* @param {Number\|String} gray number specifying value between white`
`141`	`141`	`* and black.`
`142`	`142`	`* @param {Number} [alpha] alpha value relative to current color range`
`143`		`- * (default is 0-100)`
	`143`	`+ * (default is 0-255)`
`144`	`144`	`* @return {Array} resulting color`
`145`	`145`	`*`
`146`	`146`	`* @example`