diff options
author | hwc487 | 2012-05-31 17:11:08 -0700 |
---|---|---|
committer | hwc487 | 2012-05-31 17:11:08 -0700 |
commit | 1c445cf5d905f79937998cf2f1115594ea8c1074 (patch) | |
tree | 35271ad7ffec86fde9102af3dd954fa3a2974582 /node_modules/montage/package.json | |
parent | 335ce503996e3ccbd2909086328d0a31fbd03370 (diff) | |
parent | 6042bdc5f2aada4412912fd01602d32c9088dc26 (diff) | |
download | ninja-1c445cf5d905f79937998cf2f1115594ea8c1074.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Conflicts:
js/io/system/ninjalibrary.json
Diffstat (limited to 'node_modules/montage/package.json')
-rwxr-xr-x | node_modules/montage/package.json | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/node_modules/montage/package.json b/node_modules/montage/package.json index ce4b31d5..4e57a257 100755 --- a/node_modules/montage/package.json +++ b/node_modules/montage/package.json | |||
@@ -9,6 +9,7 @@ | |||
9 | "exclude": [ | 9 | "exclude": [ |
10 | "lab/benchmarks", | 10 | "lab/benchmarks", |
11 | "lab/sandbox", | 11 | "lab/sandbox", |
12 | "lab/tools", | ||
12 | "examples", | 13 | "examples", |
13 | "require/test", | 14 | "require/test", |
14 | "require/tests", | 15 | "require/tests", |