diff options
author | hwc487 | 2012-06-13 14:04:09 -0700 |
---|---|---|
committer | hwc487 | 2012-06-13 14:04:09 -0700 |
commit | 3e481dd581e0305dd8b572ed0d17e86622223464 (patch) | |
tree | aca2b28aa72857a52e047fb94090c34ab8dd1c2c /node_modules/montage/core/converter/converter.js | |
parent | a7aa51e6b91623772eef54b827616432838b560e (diff) | |
parent | 682f4917d6badd105998c3dd84d031c38b51f017 (diff) | |
download | ninja-3e481dd581e0305dd8b572ed0d17e86622223464.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Diffstat (limited to 'node_modules/montage/core/converter/converter.js')
-rwxr-xr-x | node_modules/montage/core/converter/converter.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/node_modules/montage/core/converter/converter.js b/node_modules/montage/core/converter/converter.js index a23d2702..97e1a5f2 100755 --- a/node_modules/montage/core/converter/converter.js +++ b/node_modules/montage/core/converter/converter.js | |||
@@ -111,7 +111,8 @@ var Converter = exports.Converter = Montage.create(Montage, /** @lends module:mo | |||
111 | @default {Boolean} true | 111 | @default {Boolean} true |
112 | */ | 112 | */ |
113 | allowPartialConversion: { | 113 | allowPartialConversion: { |
114 | value: true | 114 | value: true, |
115 | serializable: true | ||
115 | }, | 116 | }, |
116 | 117 | ||
117 | /** | 118 | /** |