UNMERGE

[xonotic/darkplaces.git] / cl_screen.c

diff --git a/cl_screen.c b/cl_screen.c
index 3236056d73eb89402f59bd718e82aabae6dcada1..5dbf4d2100b4b372fb31f67b82b7cc85f4343b13 100644 (file)
--- a/cl_screen.c
+++ b/cl_screen.c
@@ -696,7 +696,7 @@ int speedstringcount, r_timereport_active;
 double r_timereport_temp = 0, r_timereport_current = 0, r_timereport_start = 0;
 int r_speeds_longestitem = 0;
 
-void R_TimeReport(const char *desc)
+void R_TimeReport(char *desc)
 {
        char tempbuf[256];
        int length;
@@ -1314,7 +1314,7 @@ Grab six views for environment mapping tests
 struct envmapinfo_s
 {
        float angles[3];
-       const char *name;
+       char *name;
        qboolean flipx, flipy, flipdiagonaly;
 }
 envmapinfo[12] =