Merge branch 'palette' of https://github.com/kberg/dygraphs into palette

Conflicts:
	experimental/palette/options.js

diff --git a/experimental/palette/options.js b/experimental/palette/options.js
index c1c17f3..4586d5b 100644 (file)
--- a/experimental/palette/options.js
+++ b/experimental/palette/options.js
@@ -34,7 +34,7 @@
  *   boolean|string|float|int|array<boolean>|array<int>|array<float>|array<Date>
  *   or function(parameter list)
  * scope: if empty, then available in global scope only. Otherwise,
- * it's an array with possible values global|series|x|y|y2.
+ * it's an array with possible values global|series|x|y|y2|highlight.
  */
 var opts = {
   animatedZooms : {