From: etimberg <evert.timberg@gmail.com>
Date: Thu, 22 Oct 2015 00:18:23 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/v2.0-dev' into v2.0-dev-tooltip-refactor
X-Git-Tag: 2.0.0-beta~4^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=24e8fe3a4b653b72e5338020a38379f94e31a4e6;p=thirdparty%2FChart.js.git

Merge remote-tracking branch 'origin/v2.0-dev' into v2.0-dev-tooltip-refactor
---

24e8fe3a4b653b72e5338020a38379f94e31a4e6
diff --cc test/scale.linear.tests.js
index ac190a3c5,cd7a2c4b5..87b82662d
--- a/test/scale.linear.tests.js
+++ b/test/scale.linear.tests.js
@@@ -1396,9 -1394,9 +1396,12 @@@ describe('Linear Scale', function() 
  		}, {
  			"name": "rotate",
  			"args": [-1.5707963267948966]
+ 		},  {
+ 			"name": "setFillStyle",
+ 			"args": ["#666"]
 +		}, {
 +			"name": "setFillStyle",
 +			"args": ["#666"]
  		}, {
  			"name": "fillText",
  			"args": ["", 0, 0]