diff options
| author | marha <marha@users.sourceforge.net> | 2015-04-30 23:26:47 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2015-04-30 23:29:47 +0200 |
| commit | 055e5645a789d2822d3c4e5a3bc81ff6a969ff31 (patch) | |
| tree | 8a923f19c3586f9341114be6c81784ab9018aef8 /mesalib/src/mesa/main/ffvertex_prog.c | |
| parent | 0f7871ff824bcf064db3ab6bdfe26645ba6c8087 (diff) | |
| parent | a71d524ecad48837e0124a03124bc05f59a48be7 (diff) | |
| download | vcxsrv-055e5645a789d2822d3c4e5a3bc81ff6a969ff31.tar.gz vcxsrv-055e5645a789d2822d3c4e5a3bc81ff6a969ff31.tar.bz2 vcxsrv-055e5645a789d2822d3c4e5a3bc81ff6a969ff31.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/main/ffvertex_prog.c')
| -rw-r--r-- | mesalib/src/mesa/main/ffvertex_prog.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/src/mesa/main/ffvertex_prog.c b/mesalib/src/mesa/main/ffvertex_prog.c index edf7e3390..7fdd9bab6 100644 --- a/mesalib/src/mesa/main/ffvertex_prog.c +++ b/mesalib/src/mesa/main/ffvertex_prog.c @@ -1657,7 +1657,7 @@ _mesa_get_fixed_func_vertex_program(struct gl_context *ctx) struct gl_vertex_program *prog; struct state_key key; - /* Grab all the relevent state and put it in a single structure: + /* Grab all the relevant state and put it in a single structure: */ make_state_key(ctx, &key); |