summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2006-08-08 15:51:58 -0700
committerEric Anholt <anholt@FreeBSD.org>2006-08-08 15:59:17 -0700
commitd150b53d102c511f3c9245ef1f6fd36c12b01ca3 (patch)
tree3d314bdcae0fc404680406eb0f265c36d5ddb208 /man
parentbb65a4dc55b416437d61ccbee8b6056fe8e08357 (diff)
parentbc5f56568021d8c63313e2b6bf30710e7516c04a (diff)
Merge branch 'i965', adding i965G support.
Conflicts: src/i830_cursor.c src/i830_driver.c
Diffstat (limited to 'man')
-rw-r--r--man/.gitignore2
1 files changed, 0 insertions, 2 deletions
diff --git a/man/.gitignore b/man/.gitignore
deleted file mode 100644
index a438e807..00000000
--- a/man/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-i810.4
-i810.4x