Fix broken merge

Author: britzl

_data/ref/alpha/camera-lua.json

@@ -637,17 +637,13 @@
     ],
     "info": {
         "brief": "Camera API documentation",
-        "description": "Messages to control camera components and camera focus.",
+        "description": "Camera functions, messages and constants.",
         "file": "",
         "language": "Lua",
         "name": "Camera",
         "namespace": "camera",
         "notes": [],
-<<<<<<< Updated upstream
-        "path": "../../proto/gamesys/camera_ddf.proto"
-=======
         "path": "render/render_script_camera.cpp",
         "type": "Defold Lua"
->>>>>>> Stashed changes
     }
 }

_data/ref/alpha/dmgameobject-cpp.json

@@ -3318,8 +3318,8 @@
             "type": "TYPEDEF"
         },
         {
-            "brief": "Opaque handle to a list of properties",
-            "description": "Opaque handle to a list of properties",
+            "brief": "Handle to a list of properties (gameobject_props.h...",
+            "description": "Handle to a list of properties (gameobject_props.h)",
             "error": "",
             "examples": "",
             "language": "",
@@ -3333,8 +3333,8 @@
             "type": "TYPEDEF"
         },
         {
-            "brief": "Handle to a list of properties (gameobject_props.h...",
-            "description": "Handle to a list of properties (gameobject_props.h)",
+            "brief": "Opaque handle to a list of properties",
+            "description": "Opaque handle to a list of properties",
             "error": "",
             "examples": "",
             "language": "",
@@ -5153,18 +5153,14 @@
         }
     ],
     "info": {
-        "brief": "SDK GameObject script API documentation",
-        "description": "[file:<dmsdk/gameobject/script.h>]",
-        "file": "dmsdk/gameobject/script.h",
+        "brief": "SDK Component API documentation",
+        "description": "[file:<dmsdk/gameobject/component.h>]\n\nApi for manipulating game object components (WIP)",
+        "file": "dmsdk/gameobject/component.h",
         "language": "C++",
-        "name": "Script",
+        "name": "Component",
         "namespace": "dmGameObject",
         "notes": [],
-<<<<<<< Updated upstream
-        "path": "dmsdk/gameobject/script.h"
-=======
         "path": "dmsdk/gameobject/component.h",
         "type": "Defold C++"
->>>>>>> Stashed changes
     }
 }

_data/ref/alpha/dmgamesystem-cpp.json

@@ -1227,18 +1227,14 @@
         }
     ],
     "info": {
-        "brief": "Component render constant API documentation",
-        "description": "[file:<dmsdk/gamesystem/render_constants.h>]\n\nApi for setting and updating component render constants",
-        "file": "dmsdk/gamesys/render_constants.h",
+        "brief": "Font resource functions",
+        "description": "Font resource functions.",
+        "file": "dmsdk/gamesys/resources/res_font.h",
         "language": "C++",
-        "name": "Component Render Constants",
+        "name": "Font Resource",
         "namespace": "dmGameSystem",
         "notes": [],
-<<<<<<< Updated upstream
-        "path": "dmsdk/gamesys/render_constants.h"
-=======
         "path": "dmsdk/gamesys/resources/res_font.h",
         "type": "Defold C++"
->>>>>>> Stashed changes
     }
 }

_data/ref/alpha/dmgraphics-cpp.json

@@ -2637,18 +2637,14 @@
         }
     ],
     "info": {
-        "brief": "Graphics API documentation",
-        "description": "[file:<dmsdk/graphics/graphics_vulkan.h>]\n\nGraphics Vulkan API",
-        "file": "dmsdk/graphics/graphics_vulkan.h",
+        "brief": "SDK Graphics API documentation",
+        "description": "Platform specific native graphics functions.",
+        "file": "dmsdk/graphics/graphics_native.h",
         "language": "C++",
-        "name": "Graphics Vulkan",
+        "name": "Graphics",
         "namespace": "dmGraphics",
         "notes": [],
-<<<<<<< Updated upstream
-        "path": "dmsdk/graphics/graphics_vulkan.h"
-=======
         "path": "dmsdk/graphics/graphics_native.h",
         "type": "Defold C++"
->>>>>>> Stashed changes
     }
 }

_data/ref/alpha/dmscript-cpp.json

@@ -2357,16 +2357,12 @@
     "info": {
         "brief": "SDK Script API documentation",
         "description": "Built-in scripting functions.",
-        "file": "dmsdk/gamesys/script.h",
+        "file": "dmsdk/script/script.h",
         "language": "C++",
         "name": "Script",
         "namespace": "dmScript",
         "notes": [],
-<<<<<<< Updated upstream
-        "path": "dmsdk/gamesys/script.h"
-=======
         "path": "dmsdk/script/script.h",
         "type": "Defold C++"
->>>>>>> Stashed changes
     }
 }

_data/ref/alpha/go-lua.json

@@ -2045,17 +2045,13 @@
     ],
     "info": {
         "brief": "Game object API documentation",
-        "description": "Game object API documentation",
+        "description": "Functions, core hooks, messages and constants for manipulation of\ngame objects. The \"go\" namespace is accessible from game object script\nfiles.",
         "file": "",
         "language": "Lua",
         "name": "Game object",
         "namespace": "go",
         "notes": [],
-<<<<<<< Updated upstream
-        "path": "../../proto/gameobject/gameobject_ddf.proto"
-=======
         "path": "gameobject_script.cpp",
         "type": "Defold Lua"
->>>>>>> Stashed changes
     }
 }

_data/ref/alpha/physics-lua.json

@@ -1781,17 +1781,13 @@
     ],
     "info": {
         "brief": "Collision object physics API documentation",
-        "description": "Collision object physics API documentation",
+        "description": "Functions and messages for collision object physics interaction\nwith other objects (collisions and ray-casting) and control of\nphysical behaviors.",
         "file": "",
         "language": "Lua",
         "name": "Collision object",
         "namespace": "physics",
         "notes": [],
-<<<<<<< Updated upstream
-        "path": "../../proto/gamesys/physics_ddf.proto"
-=======
         "path": "scripts/script_physics.cpp",
         "type": "Defold Lua"
->>>>>>> Stashed changes
     }
 }

_data/ref/alpha/resource-cpp.json

@@ -1192,11 +1192,7 @@
         "name": "System",
         "namespace": "sys",
         "notes": [],
-<<<<<<< Updated upstream
-        "path": "script/sys_ddf.proto"
-=======
         "path": "scripts/script_sys_gamesys.cpp",
         "type": "Defold Lua"
->>>>>>> Stashed changes
     }
 }