eessppeelllloo/image-sequencer
1
0
Fork 0
mirror of https://github.com/publiclab/image-sequencer.git synced 2025-12-12 19:30:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merging publiclab:master in

Browse Source
This commit is contained in:
Chinmay Pandhare
2017-03-15 08:16:04 +05:30
parent 8765f37b61 cd19a17595
commit 99e8f102c2
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
dist/image-sequencer.js vendored
View File

@@ -184151,7 +184151,10 @@ ImageSequencer = function ImageSequencer(options) {
options = options || {};
options.inBrowser = options.inBrowser || typeof window !== 'undefined';
if (options.inBrowser) options.ui = options.ui || require('./UserInterface');
<<<<<<< HEAD
options.sequencer_counter = 0;
=======
>>>>>>> master
var image,
steps = [],