aboutsummaryrefslogtreecommitdiff
path: root/js/lib/geom
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-07-20 09:52:03 -0700
committerJose Antonio Marquez2012-07-20 09:52:03 -0700
commit5d82978e9a0e0daf7c457ff87be95a3b4301999e (patch)
tree906f908fef755b8e0f57ab7a0d9ce348c398958b /js/lib/geom
parenta8b7648d2c1305eb068d42ebde9b042ee6de72ab (diff)
parent9053e2037821a5c8405fabb74db9635deacfe8d5 (diff)
downloadninja-5d82978e9a0e0daf7c457ff87be95a3b4301999e.tar.gz
Merge branch 'refs/heads/Ninja-Master' into Document
Diffstat (limited to 'js/lib/geom')
-rwxr-xr-xjs/lib/geom/geom-obj.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/js/lib/geom/geom-obj.js b/js/lib/geom/geom-obj.js
index 3cd3a89b..e0ed51fb 100755
--- a/js/lib/geom/geom-obj.js
+++ b/js/lib/geom/geom-obj.js
@@ -385,8 +385,8 @@ exports.GeomObj = Object.create(Object.prototype, {
385 case "plasma": 385 case "plasma":
386 case "deform": 386 case "deform":
387 case "water": 387 case "water":
388 case "paris": 388 case "blueSky":
389 case "raiders": 389 case "darkBlur":
390 case "tunnel": 390 case "tunnel":
391 case "reliefTunnel": 391 case "reliefTunnel":
392 case "squareTunnel": 392 case "squareTunnel":