6 Commits (7043573aaac4171c9472bd2b2397670d6fffc31b)

Author	SHA1	Message	Date
David Schnur	7043573aaa	Merge branch 'master' into 0.9-work ... Conflicts: NEWS.md component.json flot.jquery.json jquery.flot.canvas.js jquery.flot.fillbetween.js jquery.flot.pie.js jquery.flot.time.js package.json src/jquery.flot.js src/plugins/jquery.flot.crosshair.js src/plugins/jquery.flot.navigate.js src/plugins/jquery.flot.resize.js	12 years ago
David Schnur	1d3a062833	Update copyright year to 2014.	12 years ago
Nick Schonning	d37ce8e3fe	Update examples page script paths	12 years ago
Jeff Tian	eae079f580	Add missing references and minor update on jquery.flot.js. ... Revert the change on jquery.flot.js Revert the change on jquery.flot.js Add missing references and minor update on jquery.flot.js. Revert the change on jquery.flot.js Revert changes on jquery.flot.js. Revert the changes to the jquery.flot.js that made by Visual Studio 2012.	13 years ago
Nick Schonning	4e66f981e2	Move non-Bower third party code under lib	13 years ago
David Schnur	96c451a0c6	Added an example to demonstrate canvas text.	13 years ago