summaryrefslogtreecommitdiff
path: root/src/i810.h
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-04-23 19:35:55 +0000
committerEgbert Eich <eich@suse.de>2004-04-23 19:35:55 +0000
commit41eba03d0d62fe03a7b437c9c4914016c3125141 (patch)
tree9b74e1bc450726c2cb7c2abadec6d2662b7f406c /src/i810.h
parente27494f2a9262b6310c2f1e0a40c406f578fc693 (diff)
Merging XORG-CURRENT into trunkXACE-SELINUX-MERGE
Diffstat (limited to 'src/i810.h')
-rw-r--r--src/i810.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/i810.h b/src/i810.h
index f1232ba6..d82665dc 100644
--- a/src/i810.h
+++ b/src/i810.h
@@ -27,7 +27,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/programs/Xserver/hw/xfree86/drivers/i810/i810.h,v 1.42 2003/09/28 20:15:57 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810.h,v 1.41 2003/06/18 13:14:17 dawes Exp $ */
/*
* Authors: