From: Robert Konigsberg <konigsberg@google.com>
Date: Sat, 24 Nov 2012 15:56:25 +0000 (-0500)
Subject: Merge branch 'remove-old-options' of https://github.com/kberg/dygraphs into remove... 
X-Git-Tag: v1.0.0~157^2~3^2
X-Git-Url: https://adrianiainlam.tk/git/?a=commitdiff_plain;h=95c6e8e68166281bd18aab32385ded0a1129464c;p=dygraphs.git

Merge branch 'remove-old-options' of https://github.com/kberg/dygraphs into remove-old-options

Conflicts:
	dygraph.js
---

95c6e8e68166281bd18aab32385ded0a1129464c
diff --cc Makefile
index 6a645a5,6a645a5..a307c72
--- a/Makefile
+++ b/Makefile
@@@ -4,7 -4,7 +4,7 @@@
  #
  # Dean Wampler <dean@deanwampler.com> March 22, 2010
  
--all: generate-combined
++all: test generate-combined
  
  generate-combined:
  	@echo Generating dygraph-combined.js
@@@ -18,3 -18,3 +18,6 @@@ generate-gwt
  
  test:
  	@./test.sh
++
++lint:
++	@./lint.sh