[Emacs-diffs] Changes to emacs/etc/rgb.txt

[Juanma Barranquero]

Index: emacs/etc/rgb.txt
diff -c emacs/etc/rgb.txt:1.1 emacs/etc/rgb.txt:1.2
*** emacs/etc/rgb.txt:1.1       Thu Jan 18 23:32:00 1996
--- emacs/etc/rgb.txt   Tue Feb  4 09:30:42 2003
***************
*** 1,5 ****
  #
! # This file is not a part of GNU Emacs.  It is from xc/programs/rgb/rgb.txt 
  # of the X11R6 X Consortium distribution, and is included here to support the
  # mapping of color names to RGB values on Windows NT and Windows 95.
  #
--- 1,5 ----
  #
! # This file is not a part of GNU Emacs.  It is from xc/programs/rgb/rgb.txt
  # of the X11R6 X Consortium distribution, and is included here to support the
  # mapping of color names to RGB values on Windows NT and Windows 95.
  #
***************
*** 8,38 ****
  #
  #
  # Copyright (C) 1994 X Consortium
! # 
  # 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 THE
  # X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
  # AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
  # TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
! # 
  # Except as contained in this notice, the name of the X Consortium shall not
  # be used in advertising or otherwise to promote the sale, use or other deal-
  # ings in this Software without prior written authorization from the X Consor-
  # tium.
! # 
  # X Window System is a trademark of X Consortium, Inc.
! # 
  
  255 250 250           snow
  248 248 255           ghost white
--- 8,38 ----
  #
  #
  # Copyright (C) 1994 X Consortium
! #
  # 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 THE
  # X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
  # AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
  # TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
! #
  # Except as contained in this notice, the name of the X Consortium shall not
  # be used in advertising or otherwise to promote the sale, use or other deal-
  # ings in this Software without prior written authorization from the X Consor-
  # tium.
! #
  # X Window System is a trademark of X Consortium, Inc.
! #
  
  255 250 250           snow
  248 248 255           ghost white