Commit 12418142 authored by Ryan LeFevre's avatar Ryan LeFevre

Merge branch 'master' of github.com:meltingice/psd.js

parents 565c4a6e 59c5f38e
<<<<<<< HEAD
# PSD.js
A general purpose PSD parser written in Coffeescript. Based off of [PSD.rb](https://github.com/layervault/psd.rb).
Runs in both NodeJS and the browser (using browserify).
**Work in Progress**
\ No newline at end of file
**Work in Progress**
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment