| commit | 862488075c5537b0613753b0d14c267527fc6199 | [log] [tgz] |
|---|---|---|
| author | Jakob Bornecrantz <jakob@vmware.com> | Fri Jul 03 18:53:58 2009 +0200 |
| committer | Jakob Bornecrantz <jakob@vmware.com> | Fri Jul 03 18:53:58 2009 +0200 |
| tree | fd4d51272c86fbc88c12e2d16649547f3ca7b8df | |
| parent | 060c7f2321f72503c14f9f3f7bb27d59d8a90224 [diff] | |
| parent | 94e1117c9ba259665cd8e790369dcd4c789a2f93 [diff] |
Merge branch 'mesa_7_5_branch' Conflicts: src/mesa/main/dlist.c src/mesa/vbo/vbo_save_api.c