Commit Graph

2 Commits (3dcdcbd7ca6b21954c2d675c584780da24c53eb9)

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
Nick Schonning 4e66f981e2 Move non-Bower third party code under lib 13 years ago