diff options
author | Eric Guzman | 2012-07-20 11:24:19 -0700 |
---|---|---|
committer | Eric Guzman | 2012-07-20 11:24:19 -0700 |
commit | 3cc29231852440508bdeec1964e40ce59f979f99 (patch) | |
tree | 2faaf3d49337437e4a84818fe24dc64a60f8c611 /js/lib/geom/geom-obj.js | |
parent | 8fdf2fc8aefee68aec4c7b5891e0375f704cbf26 (diff) | |
parent | 9053e2037821a5c8405fabb74db9635deacfe8d5 (diff) | |
download | ninja-3cc29231852440508bdeec1964e40ce59f979f99.tar.gz |
Merge branch 'refs/heads/master' into fixes_7.1
Diffstat (limited to 'js/lib/geom/geom-obj.js')
-rwxr-xr-x | js/lib/geom/geom-obj.js | 4 |
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": |