summaryrefslogtreecommitdiff
path: root/src/i830_cursor.c
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-04 17:47:44 +0000
committerEgbert Eich <eich@suse.de>2004-03-04 17:47:44 +0000
commit2ffea633871eb30a17b37d5ae35cbf998e6bfb63 (patch)
tree44a767546075981208dcfb359d73ea27c073a7fd /src/i830_cursor.c
parent71687eeaa94c5b1ce1fbb11ff27d4e69c73a4a1d (diff)
18. Merged in XFree86 code up to 4.4.0 including changes to files thatXPRINT_BASEXORG-RELEASE-1-TM-BASEIPv6-REVIEW-BASEIPv6-REVIEW
had a changed license. There was only one change which happened to be from me (Egbert Eich).
Diffstat (limited to 'src/i830_cursor.c')
-rw-r--r--src/i830_cursor.c2
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: