| commit | b57abd3bea29e95e5dee2524c3f1be4b26017c0f | [log] [tgz] |
|---|---|---|
| author | Brian Paul <brianp@vmware.com> | Mon Dec 21 18:23:53 2009 -0700 |
| committer | Brian Paul <brianp@vmware.com> | Mon Dec 21 18:23:53 2009 -0700 |
| tree | 8da85ef6e5ef40a4a7bd328fc574a27c2b8c0849 | |
| parent | bf064ce0c31abb036fc035c59fdc1134705a5e3f [diff] | |
| parent | e46ad402f1fecf0fc8d2538eb5abbdde97484799 [diff] |
Merge branch 'mesa_7_6_branch' into mesa_7_7_branch Conflicts: configure.ac progs/demos/morph3d.c progs/demos/textures.c progs/glsl/shtest.c progs/glsl/texaaline.c progs/tests/packedpixels.c progs/xdemos/corender.c src/mesa/main/version.h