diff options
| author | Ian Romanick <[email protected]> | 2009-09-10 11:44:53 -0700 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2009-09-10 11:47:24 -0700 |
| commit | 8fd4e4dfc32e4fd44dc41948d0c35ece078d44b3 (patch) | |
| tree | 989a4b08ee8c5a84ff73de7d25bb1e6b531c3801 /docs/shading.html | |
| parent | d78a19612173eda51b93818a16a947201a785f3f (diff) | |
Fix merge fail
One of the conflicst from this merge was missed:
commit 0c309bb494b6ee1c403442d1207743f749f95b6e
Merge: c6c44bf d27d659
Author: Brian Paul <[email protected]>
Date: Wed Sep 9 08:33:39 2009 -0600
Diffstat (limited to 'docs/shading.html')
0 files changed, 0 insertions, 0 deletions