[sagenb] 109/157: Merge branch 'new_jmol' of https://github.com/vbraun/sagenb into vbraun-new_jmol

[felix salfelder]

This is an automated email from the git hooks/post-receive script.

felix-guest pushed a commit to branch master
in repository sagenb.

commit 72350268e3232c0623509f8141164fc2de5a49e8
Merge: 93f1790 23a9063
Author: Karl-Dieter Crisman <kcrisman at gmail.com>
Date:   Mon Oct 20 10:05:49 2014 -0400

    Merge branch 'new_jmol' of https://github.com/vbraun/sagenb into vbraun-new_jmol

 sagenb/data/sage/css/main.css                 |  4 +--
 sagenb/data/sage/html/notebook/base.html      | 22 ++++++----------
 sagenb/data/sage/html/notebook/text_cell.html | 36 +++++++++++++++++++--------
 sagenb/data/sage/js/jmol_lib.js               | 25 +++++++++++--------
 sagenb/data/sage/js/master.js                 |  4 +--
 sass/src/main.scss                            |  4 +--
 6 files changed, 55 insertions(+), 40 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sagenb.git