CVS Update: xc (branch: trunk)

[Alex Deucher]

CVSROOT:	/cvs/xorg
Module name:	xc
Changes by:	agd5f at gabe.freedesktop.org	05/08/06 10:23:16

Log message:
  - missing line in mergedfb option parsing.  Spotted by Christoph Bauer

Modified files:
      ./:
        ChangeLog 
      xc/programs/Xserver/hw/xfree86/drivers/ati/:
        radeon_driver.c 
  
  Revision      Changes    Path
  1.1184        +8 -0      xc/ChangeLog
  1.66          +1 -0      xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c