diff options
| author | marha <marha@users.sourceforge.net> | 2012-10-01 12:04:07 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-10-01 12:04:07 +0200 |
| commit | 7305d42f2ad0462ca3916a73df49cc6b70b41fe4 (patch) | |
| tree | 4de7ec9601f83c61d84e9b8cda40ca0f5ca6bc91 /mesalib/src/mesa/main/context.h | |
| parent | c86fbbd2c3bb30e96a614456bbb7688e0387cf8c (diff) | |
| parent | 7ed9dbafdbc724c1030404f29678559134de559b (diff) | |
| download | vcxsrv-7305d42f2ad0462ca3916a73df49cc6b70b41fe4.tar.gz vcxsrv-7305d42f2ad0462ca3916a73df49cc6b70b41fe4.tar.bz2 vcxsrv-7305d42f2ad0462ca3916a73df49cc6b70b41fe4.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
libxcb mesa pixman xkeyboard-config git update 1 oct 2012
Conflicts:
libxcb/src/man/.gitignore
Diffstat (limited to 'mesalib/src/mesa/main/context.h')
| -rw-r--r-- | mesalib/src/mesa/main/context.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mesalib/src/mesa/main/context.h b/mesalib/src/mesa/main/context.h index e2387521f..f0b4471b1 100644 --- a/mesalib/src/mesa/main/context.h +++ b/mesalib/src/mesa/main/context.h @@ -179,6 +179,8 @@ _mesa_finish(struct gl_context *ctx); extern void _mesa_flush(struct gl_context *ctx); +extern int +_mesa_generic_nop(void); extern void GLAPIENTRY _mesa_Finish( void ); |