diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-02-10 10:49:52 -0500 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-02-10 10:49:52 -0500 |
| commit | 3747a41fbe290fd5c78c3e849241e3867762bf2c (patch) | |
| tree | afea36c380c866f9119fd6ee18ef9d8b7ce44cfa /.gitignore | |
| parent | 3898be259999389686c134485df38fa6a3318d7b (diff) | |
| parent | c54aa13522dae9b0d19af50b7cb218c4f7e2407e (diff) | |
Merge branch 'webb' into tkimia
Conflicts:
docs/DesignDocument.docx
docs/DesignDocument.md
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..ed193ea --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +*.pdf +*.html +*.png +!stickman.png |