Merge branch 'master' into api-v2

Conflicts: src/dither.h src/image.h
saitoha · Oct 8, 2014 · 6a13acb · 6a13acb
2 parents 8466b4e + d49f806
commit 6a13acb
Show file tree

Hide file tree

Showing 22 changed files with 1,287 additions and 454 deletions.
diff --git a/.gitignore b/.gitignore
@@ -53,6 +53,8 @@ stamp-h1
 wic_install.reg
 wic_uninstall.reg
 libsixel.pc
+package.json.in
+include/sixel.h
 converters/snake.png
 converters/img2sixel
 converters/sixel2png