Resolved .gitignore conflict

[xonotic/darkplaces.git] / client.h

diff --git a/client.h b/client.h
index fdf1a7881f5b1c9316056c65ff514c93feaaeee5..2006e61fa8cbfa4f78daec849660494d12fd3468 100644 (file)
--- a/client.h
+++ b/client.h
@@ -1364,6 +1364,7 @@ extern model_t cl_meshentitymodels[NUM_MESHENTITIES];
 extern const char *cl_meshentitynames[NUM_MESHENTITIES];
 #define CL_Mesh_Scene() (&cl_meshentitymodels[MESH_SCENE])
 #define CL_Mesh_UI() (&cl_meshentitymodels[MESH_UI])
+void CL_MeshEntities_Init(void);
 void CL_MeshEntities_Scene_Clear(void);
 void CL_MeshEntities_Scene_AddRenderEntity(void);
 void CL_MeshEntities_Scene_FinalizeRenderEntity(void);