head 1.4; access; symbols netbsd-11-0-RC5:1.4 netbsd-11-0-RC4:1.4 netbsd-11-0-RC3:1.4 netbsd-11-0-RC2:1.4 netbsd-11-0-RC1:1.4 netbsd-11:1.4.0.16 netbsd-11-base:1.4 netbsd-10-1-RELEASE:1.4 netbsd-8-3-RELEASE:1.4 netbsd-9-4-RELEASE:1.4 netbsd-10-0-RELEASE:1.4 netbsd-10-0-RC6:1.4 netbsd-10-0-RC5:1.4 netbsd-10-0-RC4:1.4 netbsd-10-0-RC3:1.4 netbsd-10-0-RC2:1.4 netbsd-10-0-RC1:1.4 xf86-video-vesa-2-6-0:1.1.1.3 netbsd-10:1.4.0.14 netbsd-10-base:1.4 netbsd-9-3-RELEASE:1.4 netbsd-9-2-RELEASE:1.4 xf86-video-vesa-2-5-0:1.1.1.3 netbsd-9-1-RELEASE:1.4 netbsd-8-2-RELEASE:1.4 netbsd-9-0-RELEASE:1.4 netbsd-9-0-RC2:1.4 netbsd-9-0-RC1:1.4 netbsd-9:1.4.0.12 netbsd-9-base:1.4 netbsd-8-1-RELEASE:1.4 netbsd-8-1-RC1:1.4 netbsd-7-2-RELEASE:1.4 netbsd-8-0-RELEASE:1.4 netbsd-8-0-RC2:1.4 netbsd-8-0-RC1:1.4 netbsd-7-1-2-RELEASE:1.4 xf86-video-vesa-2-4-0:1.1.1.3 netbsd-7-1-1-RELEASE:1.4 netbsd-8:1.4.0.10 netbsd-8-base:1.4 netbsd-7-1:1.4.0.8 netbsd-7-1-RELEASE:1.4 netbsd-7-1-RC2:1.4 netbsd-7-1-RC1:1.4 netbsd-7-0-2-RELEASE:1.4 netbsd-7-0-1-RELEASE:1.4 netbsd-7-0:1.4.0.6 netbsd-7-0-RELEASE:1.4 netbsd-7-0-RC3:1.4 netbsd-7-0-RC2:1.4 xf86-video-vesa-2-3-4:1.1.1.3 netbsd-7-0-RC1:1.4 netbsd-5-2-3-RELEASE:1.1.1.1.2.1 netbsd-5-1-5-RELEASE:1.1.1.1.2.1 netbsd-6-0-6-RELEASE:1.3 netbsd-6-1-5-RELEASE:1.3 netbsd-7:1.4.0.4 netbsd-7-base:1.4 netbsd-6-1-4-RELEASE:1.3 netbsd-6-0-5-RELEASE:1.3 riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.4 xf86-video-vesa-2-3-3:1.1.1.3 riastradh-drm2:1.4.0.2 riastradh-drm2-base:1.4 netbsd-6-1-3-RELEASE:1.3 netbsd-6-0-4-RELEASE:1.3 netbsd-5-2-2-RELEASE:1.1.1.1.2.1 netbsd-5-1-4-RELEASE:1.1.1.1.2.1 netbsd-6-1-2-RELEASE:1.3 netbsd-6-0-3-RELEASE:1.3 netbsd-5-2-1-RELEASE:1.1.1.1.2.1 netbsd-5-1-3-RELEASE:1.1.1.1.2.1 netbsd-6-1-1-RELEASE:1.3 xf86-video-vesa-2-3-2:1.1.1.3 netbsd-6-1:1.3.0.6 netbsd-6-0-2-RELEASE:1.3 netbsd-6-1-RELEASE:1.3 netbsd-6-1-RC4:1.3 netbsd-6-1-RC3:1.3 netbsd-6-1-RC2:1.3 netbsd-6-1-RC1:1.3 netbsd-5-2:1.1.1.1.2.1.0.4 netbsd-6-0-1-RELEASE:1.3 netbsd-5-2-RELEASE:1.1.1.1.2.1 netbsd-5-2-RC1:1.1.1.1.2.1 netbsd-6-0:1.3.0.4 netbsd-6-0-RELEASE:1.3 netbsd-6-0-RC2:1.3 netbsd-6-0-RC1:1.3 netbsd-6:1.3.0.2 netbsd-6-base:1.3 netbsd-5-1-2-RELEASE:1.1.1.1.2.1 netbsd-5-1-1-RELEASE:1.1.1.1.2.1 netbsd-5-1:1.1.1.1.2.1.0.2 netbsd-5-1-RELEASE:1.1.1.1.2.1 netbsd-5-1-RC4:1.1.1.1.2.1 netbsd-5-1-RC3:1.1.1.1.2.1 xf86-video-vesa-2-3-0:1.1.1.2 netbsd-5-1-RC2:1.1.1.1.2.1 netbsd-5-1-RC1:1.1.1.1.2.1 netbsd-5-0-2-RELEASE:1.1.1.1 xf86-video-vesa-2-2-1:1.1.1.2 netbsd-5-0-1-RELEASE:1.1.1.1 xf86-video-vesa-2-2-0:1.1.1.2 netbsd-5-0:1.1.1.1.0.4 netbsd-5-0-RELEASE:1.1.1.1 netbsd-5-0-RC4:1.1.1.1 netbsd-5-0-RC3:1.1.1.1 netbsd-5-0-RC2:1.1.1.1 netbsd-5-0-RC1:1.1.1.1 netbsd-5:1.1.1.1.0.2 netbsd-5-base:1.1.1.1 xf86-video-vesa-1-3-0:1.1.1.1 xorg:1.1.1; locks; strict; comment @# @; 1.4 date 2013.06.01.08.55.04; author mrg; state Exp; branches; next 1.3; commitid n7isWne6SKZ8gTRw; 1.3 date 2009.06.11.15.52.23; author mrg; state Exp; branches; next 1.2; 1.2 date 2009.06.10.07.30.01; author mrg; state Exp; branches; next 1.1; 1.1 date 2008.08.02.05.17.40; author mrg; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2008.08.02.05.17.40; author mrg; state Exp; branches 1.1.1.1.2.1; next 1.1.1.2; 1.1.1.2 date 2009.06.10.06.41.43; author mrg; state Exp; branches; next 1.1.1.3; 1.1.1.3 date 2013.06.01.08.53.56; author mrg; state Exp; branches; next ; commitid bwMpTGwpVdfLfTRw; 1.1.1.1.2.1 date 2009.09.17.03.34.32; author snj; state Exp; branches; next ; desc @@ 1.4 log @merge xf86-video-vesa 2.3.2 @ text @Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com) Copyright 2008 Red Hat, Inc. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL CONECTIVA LINUX BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. Except as contained in this notice, the name of Conectiva Linux shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from Conectiva Linux. @ 1.3 log @re-merge xf86-video-vesa 2.2.0 @ text @d2 1 @ 1.2 log @revert to xf86-video-vesa 1.3.0. 2.2.0 has dependancies on a newer xorg-server. @ text @d1 1 a1 3 This is a stub file. This package has not yet had its complete licensing information compiled. Please see the individual source files for details on your rights to use and modify this software. d3 6 a8 1 Please submit updated COPYING files to the Xorg bugzilla: d10 10 a19 1 https://bugs.freedesktop.org/enter_bug.cgi?product=xorg d21 4 a24 4 All licensing questions regarding this software should be directed at the Xorg mailing list: http://lists.freedesktop.org/mailman/listinfo/xorg @ 1.1 log @Initial revision @ text @@ 1.1.1.1 log @initial import of xf86-video-vesa-1.3.0 @ text @@ 1.1.1.1.2.1 log @Apply patch (requested by mrg in ticket #958): Bring over X.Org updates from HEAD. @ text @d1 3 a3 1 Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com) d5 1 a5 6 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: d7 1 a7 10 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL CONECTIVA LINUX BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. d9 4 a12 4 Except as contained in this notice, the name of Conectiva Linux shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from Conectiva Linux. @ 1.1.1.2 log @initial import of xf86-video-vesa-2.2.0 @ text @d1 3 a3 1 Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com) d5 1 a5 6 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: d7 1 a7 10 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL CONECTIVA LINUX BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. d9 4 a12 4 Except as contained in this notice, the name of Conectiva Linux shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from Conectiva Linux. @ 1.1.1.3 log @initial import of xf86-video-vesa-2.3.2 @ text @a1 1 Copyright 2008 Red Hat, Inc. @