diff options
| author | Michel Dänzer <michel@tungstengraphics.com> | 2006-12-19 16:29:26 +0100 |
|---|---|---|
| committer | Michel Dänzer <michel@tungstengraphics.com> | 2006-12-19 16:29:26 +0100 |
| commit | 4334860e69e7d5b156082bd05c7a86708e5bad4c (patch) | |
| tree | 380e4abcbfc8950b000ff72b0347e78fee3bc74a /hw/xfree86/xaa/xaaTEText.c | |
| parent | 7e4717683d6c08d1e490a60b7493a94bbc57bf8d (diff) | |
| parent | fdcc22ca1704d3519156c66804528c21b04fea65 (diff) | |
Merge branch 'master' into exa-damagetrack
Conflicts:
exa/exa_accel.c
exa/exa_migration.c
Diffstat (limited to 'hw/xfree86/xaa/xaaTEText.c')
| -rw-r--r-- | hw/xfree86/xaa/xaaTEText.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/hw/xfree86/xaa/xaaTEText.c b/hw/xfree86/xaa/xaaTEText.c index 72e1858f6..fc445726f 100644 --- a/hw/xfree86/xaa/xaaTEText.c +++ b/hw/xfree86/xaa/xaaTEText.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaTEText.c,v 1.6 1998/12/20 11:57:52 dawes Exp $ */ /******************************************************************** |