[Pkg-javascript-commits] [SCM] flot branch, master, updated. debian/0.6-1-33-g9759e10

[Marcelo Jorge Vieira]

The following commit has been merged in the master branch:
commit 0761bc22848c0e813cd71420fac5cdd9593a4e0c
Merge: afd12046ba1c11fc5f2f337d25c683b57a144882 ad387bdbabdd55d3a27cddcfcdafbe59d11fd831
Author: Marcelo Jorge Vieira <metal at alucinados.com>
Date:   Mon May 6 00:28:33 2013 -0300

    Merge tag 'upstream/0.8.0+dfsg'
    
    Upstream version 0.8.0+dfsg
    
    Conflicts:
    	API.txt
    	FAQ.txt
    	NEWS.txt
    	PLUGINS.txt
    	README.txt
    	examples/ajax.html
    	examples/annotating.html
    	examples/basic.html
    	examples/data-eu-gdp-growth-1.json
    	examples/data-eu-gdp-growth-2.json
    	examples/data-eu-gdp-growth-3.json
    	examples/data-eu-gdp-growth-4.json
    	examples/data-eu-gdp-growth-5.json
    	examples/data-eu-gdp-growth.json
    	examples/data-japan-gdp-growth.json
    	examples/data-usa-gdp-growth.json
    	examples/graph-types.html
    	examples/image.html
    	examples/index.html
    	examples/interacting.html
    	examples/multiple-axes.html
    	examples/navigate.html
    	examples/selection.html
    	examples/setting-options.html
    	examples/stacking.html
    	examples/thresholding.html
    	examples/time.html
    	examples/tracking.html
    	examples/turning-series.html
    	examples/visitors.html
    	examples/zooming.html
    	jquery.flot.crosshair.js
    	jquery.flot.fillbetween.js
    	jquery.flot.js
    	jquery.flot.navigate.js
    	jquery.flot.pie.js
    	jquery.flot.resize.js
    	jquery.flot.selection.js
    	jquery.flot.stack.js
    	jquery.flot.symbol.js


-- 
flot