commit | 562c127693200822f04a145db50add1be2425d7b | [log] [tgz] |
---|---|---|
author | Chia-I Wu <olvaffe@gmail.com> | Tue Jan 12 11:25:02 2010 +0800 |
committer | Chia-I Wu <olvaffe@gmail.com> | Tue Jan 12 11:25:02 2010 +0800 |
tree | 9441774fb212b17ddf2a364f06abc43f166cc00b | |
parent | e5d351dcfde58777162552cf5cd2a9cd8299f4cd [diff] | |
parent | 077d6dd7508af88509dd0499c5dfbdaa186b4015 [diff] |
Merge branch 'master' into opengl-es-v2 Conflicts: src/mesa/main/dd.h