diff options
| author | Chia-I Wu <olvaffe@gmail.com> | 2010-01-12 11:25:02 +0800 |
|---|---|---|
| committer | Chia-I Wu <olvaffe@gmail.com> | 2010-01-12 11:25:02 +0800 |
| commit | 562c127693200822f04a145db50add1be2425d7b (patch) | |
| tree | 9441774fb212b17ddf2a364f06abc43f166cc00b /include/GL/glx_mangle.h | |
| parent | e5d351dcfde58777162552cf5cd2a9cd8299f4cd (diff) | |
| parent | 077d6dd7508af88509dd0499c5dfbdaa186b4015 (diff) | |
Merge branch 'master' into opengl-es-v2
Conflicts:
src/mesa/main/dd.h
Diffstat (limited to 'include/GL/glx_mangle.h')
| -rw-r--r-- | include/GL/glx_mangle.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/GL/glx_mangle.h b/include/GL/glx_mangle.h index 4439a96b5d..fa664a7f59 100644 --- a/include/GL/glx_mangle.h +++ b/include/GL/glx_mangle.h @@ -76,6 +76,7 @@ /* GLX 1.4 */ #define glXGetProcAddress mglXGetProcAddress +#define glXGetProcAddressARB mglXGetProcAddressARB #endif |