diff options
author | hwc487 | 2012-03-23 13:49:03 -0700 |
---|---|---|
committer | hwc487 | 2012-03-23 13:49:03 -0700 |
commit | 51478dbad8290f55eeab9efdfb8c2cbe24b12b10 (patch) | |
tree | 1524c53d027d1f2f8cbb759f61e4d73b52b00481 /node_modules/montage/ui/flow.reel/flow.js | |
parent | 31e924e1b8b8da8342b3ff2341c8284915486c0b (diff) | |
parent | bc8b0c17023ddea6d77150694a777e104ef99cbc (diff) | |
download | ninja-51478dbad8290f55eeab9efdfb8c2cbe24b12b10.tar.gz |
Merge branch 'montage-integration' of github.com:Motorola-Mobility/ninja-internal into integration
Conflicts:
js/io/system/ninjalibrary.json
Diffstat (limited to 'node_modules/montage/ui/flow.reel/flow.js')
-rw-r--r-- | node_modules/montage/ui/flow.reel/flow.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/node_modules/montage/ui/flow.reel/flow.js b/node_modules/montage/ui/flow.reel/flow.js index f1311292..089353a8 100644 --- a/node_modules/montage/ui/flow.reel/flow.js +++ b/node_modules/montage/ui/flow.reel/flow.js | |||
@@ -549,7 +549,7 @@ var Flow = exports.Flow = Montage.create(Component, { | |||
549 | }, | 549 | }, |
550 | 550 | ||
551 | _range: { | 551 | _range: { |
552 | value: 15 | 552 | value: 25 |
553 | }, | 553 | }, |
554 | 554 | ||
555 | lastDrawTime: { | 555 | lastDrawTime: { |