3 Commits (4d295af5f60e001726fece674e9d851eba74241a)

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	3035aaaeca	Merge branch 'master' into 0.9-work ... Conflicts: component.json flot.jquery.json jquery.flot.js jquery.flot.pie.js jquery.flot.resize.js lib/jquery.colorhelpers.js package.json	13 years ago
Nick Schonning	4e66f981e2	Move non-Bower third party code under lib	13 years ago