summaryrefslogtreecommitdiff
path: root/xc/lib/GL/mesa/src/drv/i810/i810_xmesa.c
diff options
context:
space:
mode:
authorgareth <gareth>2000-12-01 20:37:35 +0000
committergareth <gareth>2000-12-01 20:37:35 +0000
commit0fa77f7f91a09cf332fd0433c7b6e962a80cecaf (patch)
tree4957535f0a4e846af59b7a8d92a852b71ddebaab /xc/lib/GL/mesa/src/drv/i810/i810_xmesa.c
parentd03307dd9f98036c40abf2f98dac3fde22ef2e89 (diff)
Merge with trunk (almost there!).ati-4-1-1-20001202-mergeati-4-1-1-branch
Diffstat (limited to 'xc/lib/GL/mesa/src/drv/i810/i810_xmesa.c')
-rw-r--r--xc/lib/GL/mesa/src/drv/i810/i810_xmesa.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/xc/lib/GL/mesa/src/drv/i810/i810_xmesa.c b/xc/lib/GL/mesa/src/drv/i810/i810_xmesa.c
index 73c6bf3e9..b2bb932ee 100644
--- a/xc/lib/GL/mesa/src/drv/i810/i810_xmesa.c
+++ b/xc/lib/GL/mesa/src/drv/i810/i810_xmesa.c
@@ -24,7 +24,7 @@ TORT OR 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/i810/i810_xmesa.c,v 1.7 2000/09/24 13:51:04 alanh Exp $ */
+/* $XFree86: xc/lib/GL/mesa/src/drv/i810/i810_xmesa.c,v 1.8 2000/11/08 05:02:43 dawes Exp $ */
/*
* Authors: