Permalink
Browse files

Merge branch 'integrate-dc.js'

Ran into conflicts over the generated file dependencies_bundle.min.js because both branches added new javascripts to it and there's no good way to merge this severely munged file.  So I just rebuilt it and checked in the product.
  • Loading branch information...
2 parents 34a58a7 + 9aedcd6 commit 9f96a699a4682742a0883e751c8fe07cfa63aa22 @gordonwoodhull gordonwoodhull committed Mar 17, 2013
Showing with 9,056 additions and 24 deletions.
  1. +2 −0 htdocs/lib/Makefile
  2. +4,514 −0 htdocs/lib/dependencies_bundle.js
  3. +25 −24 htdocs/lib/dependencies_bundle.min.js
  4. +1,267 −0 htdocs/lib/js/crossfilter.js
  5. +3,248 −0 htdocs/lib/js/dc.js
View
@@ -34,6 +34,8 @@ dependencies_bundle.js: \
js/jquery.terminal-0.4.7.js \
js/d3.v2.js \
js/facet.js \
+ js/crossfilter.js \
+ js/dc.js \
js/colorbrewer.js \
js/rserve.js \
js/hl.min.js \
Oops, something went wrong.

0 comments on commit 9f96a69

Please sign in to comment.