diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:40:24 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:40:24 +0000 |
| commit | 7d27a815b614d93698b6d3de4c8a102e35d9fe99 (patch) | |
| tree | 44a767546075981208dcfb359d73ea27c073a7fd /src/i830_cursor.c | |
| parent | 71687eeaa94c5b1ce1fbb11ff27d4e69c73a4a1d (diff) | |
23. Merged with XFree86 4.4.0. Added changes that went into infectedXACE-SELINUX-BASEDAMAGE-XFIXES-BASEDAMAGE-XFIXES
files. Reverted darwin/bundle/**/Credits.rtf to XFree86 versions
to avoid future conflicts on ASCII but not humal readable files.
(There should probably be separate CreditsXorg.rtf files)
(Egbert Eich).
Diffstat (limited to 'src/i830_cursor.c')
| -rw-r--r-- | src/i830_cursor.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/i830_cursor.c b/src/i830_cursor.c index ef9a81ee..9f2baa3a 100644 --- a/src/i830_cursor.c +++ b/src/i830_cursor.c @@ -26,7 +26,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/i830_cursor.c,v 1.7 2003/06/18 13:14:17 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i830_cursor.c,v 1.6 2002/12/18 15:49:01 dawes Exp $ */ /* * Reformatted with GNU indent (2.2.8), using the following options: |