diff options
| author | marha <marha@users.sourceforge.net> | 2013-10-18 11:59:15 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-10-18 11:59:15 +0200 |
| commit | b821fe861f33d7e8a39fe4c7d885b7ff379dc476 (patch) | |
| tree | 7b3c0b22d35eadf598cff3965413a96c76d5ad39 /mesalib/include/GL/wglext.h | |
| parent | 56e12b1310b1b52d00bc27e919d915255af5bf03 (diff) | |
| parent | b8a77c943fa53005b6cdb1ab792acf5ff0a131be (diff) | |
| download | vcxsrv-b821fe861f33d7e8a39fe4c7d885b7ff379dc476.tar.gz vcxsrv-b821fe861f33d7e8a39fe4c7d885b7ff379dc476.tar.bz2 vcxsrv-b821fe861f33d7e8a39fe4c7d885b7ff379dc476.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
mesa pixman git update 18 okt 2013
Conflicts:
mesalib/include/GL/glext.h
mesalib/include/GL/glxext.h
Diffstat (limited to 'mesalib/include/GL/wglext.h')
| -rw-r--r-- | mesalib/include/GL/wglext.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/include/GL/wglext.h b/mesalib/include/GL/wglext.h index 775cb4710..20ecad200 100644 --- a/mesalib/include/GL/wglext.h +++ b/mesalib/include/GL/wglext.h @@ -33,7 +33,7 @@ extern "C" { ** used to make the header, and the header can be found at ** http://www.opengl.org/registry/ ** -** Khronos $Revision$ on $Date$ +** Khronos $Revision: 23328 $ on $Date: 2013-10-02 02:28:28 -0700 (Wed, 02 Oct 2013) $ */ #if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) |