diff options
| author | marha <marha@users.sourceforge.net> | 2015-03-22 14:10:47 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2015-03-22 14:10:47 +0100 |
| commit | 3bc24b271f45f9f33484b8cf53b44f33f7e8a237 (patch) | |
| tree | 193651a94adb3804e800747e993d07b92688e4d4 /mesalib/src/mesa/program/prog_statevars.c | |
| parent | c646056120fe14e4c4ccf81bac5d78d61225a8e8 (diff) | |
| parent | 82c8df11062f72a7d467e26cedbbd8b322ff7a70 (diff) | |
| download | vcxsrv-3bc24b271f45f9f33484b8cf53b44f33f7e8a237.tar.gz vcxsrv-3bc24b271f45f9f33484b8cf53b44f33f7e8a237.tar.bz2 vcxsrv-3bc24b271f45f9f33484b8cf53b44f33f7e8a237.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mapi/glapi/glapi.h
mesalib/src/mapi/glapi/glapi_nop.c
mesalib/src/mesa/main/bufferobj.c
Diffstat (limited to 'mesalib/src/mesa/program/prog_statevars.c')
| -rw-r--r-- | mesalib/src/mesa/program/prog_statevars.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/src/mesa/program/prog_statevars.c b/mesalib/src/mesa/program/prog_statevars.c index 57b25a7e3..0c0c87faa 100644 --- a/mesalib/src/mesa/program/prog_statevars.c +++ b/mesalib/src/mesa/program/prog_statevars.c @@ -1045,7 +1045,7 @@ _mesa_program_state_string(const gl_state_index state[STATE_LENGTH]) break; } - return _mesa_strdup(str); + return strdup(str); } |