From: Robert Konigsberg <konigsberg@gmail.com>
Date: Fri, 28 Dec 2012 21:08:25 +0000 (-0500)
Subject: Merge branch 'palette' of https://github.com/kberg/dygraphs into palette
X-Git-Tag: v1.0.0~139^2~13
X-Git-Url: https://adrianiainlam.tk/git/?a=commitdiff_plain;h=fe631b38a1490b6573018e266f512bce0207d2ab;hp=0193e7efb2dec61f5bbfdce8e355babe87b7001f;p=dygraphs.git

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
--- 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 : {