diff options
| author | marha <marha@users.sourceforge.net> | 2012-06-11 09:01:24 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-06-11 09:01:24 +0200 |
| commit | a660c10f0f261b390ada5c3a5d0543088830f070 (patch) | |
| tree | 522977aa2a1be8687b1399e8afa2503daa58821b /mesalib/src/mapi/glapi | |
| parent | 72ec0e3bb2d7fc6b77b2a75873792f781679da6a (diff) | |
| parent | 080d1527a5358dd66ac927acbe0ec61cba7aa7e1 (diff) | |
| download | vcxsrv-a660c10f0f261b390ada5c3a5d0543088830f070.tar.gz vcxsrv-a660c10f0f261b390ada5c3a5d0543088830f070.tar.bz2 vcxsrv-a660c10f0f261b390ada5c3a5d0543088830f070.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/glsl/glcpp/.gitignore
Diffstat (limited to 'mesalib/src/mapi/glapi')
| -rw-r--r-- | mesalib/src/mapi/glapi/.gitignore | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/mesalib/src/mapi/glapi/.gitignore b/mesalib/src/mapi/glapi/.gitignore index 21edf4f58..ecae56a3f 100644 --- a/mesalib/src/mapi/glapi/.gitignore +++ b/mesalib/src/mapi/glapi/.gitignore @@ -1,14 +1,3 @@ -.cvsignore -glX_proto_common.pyo -glX_proto_common.pyc -typeexpr.pyo -typeexpr.pyc -license.pyo -license.pyc -gl_XML.pyo -gl_XML.pyc -glX_XML.pyo -glX_XML.pyc glapi_gentable.c glapi_gentable.h glapi_mapi_tmp.h |