Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti

1 files changed, 3 insertions, 3 deletions

diff --git a/assets/descriptor.json b/assets/descriptor.json
index d9d74e6b..db824387 100644
--- a/assets/descriptor.json
+++ b/assets/descriptor.json
@@ -20,9 +20,9 @@
                 "images/cubelight.png",
                 "images/random_normal.png",
                 "images/white.png",
-        "images/paris.png",
+        "images/bluesky.png",
         "images/powderblue.png",
-        "images/raiders.png",
+        "images/darkblur.png",
         "images/us_flag.png",
                 "shaders/Basic.frag.glsl",
                 "shaders/TwistVert.vert.glsl",
@@ -34,9 +34,9 @@
                 "shaders/linearGradient.frag.glsl",
                 "shaders/linearGradient.vert.glsl",
                 "shaders/plasma.frag.glsl",
-        "shaders/Paris.frag.glsl",
                 "shaders/plasma.vert.glsl",
                 "shaders/Pulse.frag.glsl",
+                "shaders/radialBlur.frag.glsl",
                 "shaders/radialGradient.frag.glsl",
                 "shaders/radialGradient.vert.glsl",
                 "shaders/test_fshader.glsl",