diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2008-05-27 00:59:41 +1000 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2008-05-27 00:59:41 +1000 |
| commit | 0f9635d9d522ea712724415599ceb44d53e67819 (patch) | |
| tree | 91484d00053baeb265d04a54a116229562194217 /src/mesa/drivers/dri/sis/sis_alloc.c | |
| parent | 8f67f98959261d193cb5f3db274b55fb24e2bb1e (diff) | |
| parent | 253066d716e3039522eeb7b072811cccd89b4a82 (diff) | |
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
Diffstat (limited to 'src/mesa/drivers/dri/sis/sis_alloc.c')
| -rw-r--r-- | src/mesa/drivers/dri/sis/sis_alloc.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/sis/sis_alloc.c b/src/mesa/drivers/dri/sis/sis_alloc.c index b696eeb51a..4ca4052803 100644 --- a/src/mesa/drivers/dri/sis/sis_alloc.c +++ b/src/mesa/drivers/dri/sis/sis_alloc.c @@ -24,7 +24,6 @@ OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. **************************************************************************/ -/* $XFree86: xc/lib/GL/mesa/src/drv/sis/sis_alloc.c,v 1.7 2001/01/08 01:07:29 martin Exp $ */ /* * Authors: |