Merged master to feature/image-source

This commit is contained in:
Christoph Oberhofer
2017-05-25 21:46:37 +02:00
45 changed files with 9095 additions and 6520 deletions
+1 -1
View File
@@ -24,7 +24,7 @@ InputStream.createImageStream = function() {
function loadImages() {
loaded = false;
GetPixels(baseUrl, function(err, pixels) {
GetPixels(baseUrl, _config.mime, function(err, pixels) {
if (err) {
console.log(err);
exit(1);
+4317 -3107
View File
File diff suppressed because it is too large Load Diff
+1 -1
View File
File diff suppressed because one or more lines are too long