diff options
| author | Kruti Shah | 2012-07-20 11:38:57 -0700 |
|---|---|---|
| committer | Kruti Shah | 2012-07-20 11:38:57 -0700 |
| commit | 4436c04c81e0f372b7e03416a2515630de8c72c6 (patch) | |
| tree | edfbd366df9d7e7514425561a817fc2c67f398d9 /js/lib/geom/geom-obj.js | |
| parent | 5741fbc0a2eb1a43017b76406056bc98cdf00297 (diff) | |
| parent | 936fbd6d76d35e3f9574983682c266de6dce55f7 (diff) | |
| download | ninja-4436c04c81e0f372b7e03416a2515630de8c72c6.tar.gz | |
Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti
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": |