merged from dev

This commit is contained in:
Niklas von Hertzen
2011-09-12 21:35:37 +03:00
parent 07c0c13cc1
commit 27ee971bba
26 changed files with 2470 additions and 14360 deletions

5
.gitignore vendored
View File

@@ -1,9 +1,14 @@
/nbproject/
/images/
/external/
/tests/templates/
/tests/cache/
/tests/flashcanvas.html
/lib/
/dist/
/build/tmp.js
/build/html2canvas.min.js
index.html
image.jpg
screenshots.html
screenshots_local.html