Merged conflicts from pulling down latest development

Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-07-02 16:29:27 -05:00
parent 40f9761f86 e9dd032a75
commit f47e71da36
119 changed files with 1006 additions and 1506 deletions
@@ -1,10 +1,14 @@
 {
    "gem_name": "ImageProcessingAtom",
    "display_name": "Atom Image Processing",
+    "license": "Apache-2.0 Or MIT",
+    "origin": "Open 3D Engine - o3de.org",
+    "type": "Code",
    "summary": "",
    "canonical_tags": [
        "Gem"
    ],
    "user_tags": [
-    ]
+    ],
+    "requirements": ""
 }