diff options
| author | marha <marha@users.sourceforge.net> | 2012-10-11 10:09:13 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-10-11 10:09:13 +0200 |
| commit | 30c05ead4fe1b6a341d5b585e3a6b5d255edf650 (patch) | |
| tree | 932b22aede860e3ab2efe50116ad776f81c04606 /mesalib/src/mesa/main/.gitignore | |
| parent | ac799961eb382e48c68ffda1e1a89b346eb97f81 (diff) | |
| parent | 8223fb176264123c86c0d3eb845973d00fd62cc2 (diff) | |
| download | vcxsrv-30c05ead4fe1b6a341d5b585e3a6b5d255edf650.tar.gz vcxsrv-30c05ead4fe1b6a341d5b585e3a6b5d255edf650.tar.bz2 vcxsrv-30c05ead4fe1b6a341d5b585e3a6b5d255edf650.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
xwininfo mesa git update 11 oct 2012
Conflicts:
mesalib/src/mapi/glapi/gen/glX_proto_recv.py
mesalib/src/mapi/glapi/gen/glX_proto_size.py
mesalib/src/mapi/glapi/gen/glX_server_table.py
mesalib/src/mapi/glapi/gen/gl_table.py
mesalib/src/mesa/main/.gitignore
Diffstat (limited to 'mesalib/src/mesa/main/.gitignore')
| -rw-r--r-- | mesalib/src/mesa/main/.gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mesalib/src/mesa/main/.gitignore b/mesalib/src/mesa/main/.gitignore index 8b94c55af..edbdfb598 100644 --- a/mesalib/src/mesa/main/.gitignore +++ b/mesalib/src/mesa/main/.gitignore @@ -8,4 +8,6 @@ git_sha1.h.tmp api_exec_es1_dispatch.h
api_exec_es1_remap_helper.h
remap_helper.h
+get_hash.h
+get_hash.h.tmp
glapitable.h
|