Merge branch 'master' into bc-namespaced
authorW. Trevor King <wking@tremily.us>
Mon, 9 Nov 2015 18:27:48 +0000 (10:27 -0800)
committerW. Trevor King <wking@tremily.us>
Mon, 9 Nov 2015 18:27:48 +0000 (10:27 -0800)
commit4a7c2b09b80c3977ddc26274259b1c2240adc26f
tree7b02c8dd7808be68d5111ab4c93ac5e07cb2d1ba
parentb36372f583ff7bb9b254101794069b2f31b5401a
parent74844ea43e4df102d9013eae92d19f7f924ee00b
Merge branch 'master' into bc-namespaced

* master:
  swc-installation-test-2.py: Disable sympy, Cython, networkx, and mayavi.mlab
  swc-installation-test-2.py: Comment explaining implemention
setup/swc-installation-test-2.py