Skip to content

Commit

Permalink
Merge branch 'patch-1' of git://github.com/vuLgAr/merlin into graphing
Browse files Browse the repository at this point in the history
  • Loading branch information
ellonweb committed Aug 26, 2011
2 parents 28a0f8d + 869ebe4 commit 3d514a7
Showing 1 changed file with 13 additions and 5 deletions.
18 changes: 13 additions & 5 deletions README
Expand Up @@ -14,11 +14,19 @@ Additional Arthur requirements:
Django
Jinja2 2.6

Additional Graphing requirements:
numpy 1.1
matplotlib 1.0
libpng 1.1 (included in matplotlib Windows installer)
freetype 1.4 (included in matplotlib Windows installer)
Additional Graphing requirements:
numpy 1.1
matplotlib 1.0

For Nix* you will need to compile:
matplotlib (source) * http://matplotlib.sourceforge.net/faq/installing_faq.html#install-from-git

Then create these dir's and chmod 777 them both
/var/www/.matplotlib
/merlin/Arthur/graphs




Setting up Git: (Consult Git's website for full instructions)
1) Navigate to the parent directory where you wish to install Merlin
Expand Down

0 comments on commit 3d514a7

Please sign in to comment.