From bef79a5b598ff3bfd0a0cbfe756c82f3945c18b0 Mon Sep 17 00:00:00 2001
From: David M Sibley <dmsibley@usgs.gov>
Date: Mon, 3 Dec 2012 13:48:47 -0600
Subject: [PATCH] synched generate-combined.sh to dygraphs-dev.js

---
 generate-combined.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/generate-combined.sh b/generate-combined.sh
index 855313e..40c8019 100755
--- a/generate-combined.sh
+++ b/generate-combined.sh
@@ -6,6 +6,11 @@
 # This list needs to be kept in sync w/ the one in dygraph-dev.js
 # and the one in jsTestDriver.conf.
 cat \
+strftime/strftime-min.js \
+rgbcolor/rgbcolor.js \
+stacktrace.js \
+dashed-canvas.js \
+dygraph-options.js \
 dygraph-layout.js \
 dygraph-canvas.js \
 dygraph.js \
@@ -14,9 +19,6 @@ dygraph-gviz.js \
 dygraph-interaction-model.js \
 dygraph-range-selector.js \
 dygraph-tickers.js \
-rgbcolor/rgbcolor.js \
-strftime/strftime-min.js \
-dashed-canvas.js \
 plugins/base.js \
 plugins/annotations.js \
 plugins/axes.js \
-- 
2.7.4