CVS Update: xserver (branch: trunk)

[Adam Jackson]

CVSROOT:	/cvs/xorg
Module name:	xserver
Changes by:	ajax at gabe.freedesktop.org	05/12/14 12:11:16

Log message:
  Bug #4718: Command line flag to disable ACPI.

Modified files:
      xserver/xorg/:
        ChangeLog 
      xserver/xorg/hw/xfree86/common/:
        xf86Globals.c xf86Init.c xf86Priv.h 
      xserver/xorg/hw/xfree86/os-support/linux/:
        lnx_apm.c 
  
  Revision      Changes    Path
  1.149         +8 -0      xserver/xorg/ChangeLog
  http://cvs.freedesktop.org/xorg/xserver/xorg/ChangeLog
  1.9           +1 -0      xserver/xorg/hw/xfree86/common/xf86Globals.c
  http://cvs.freedesktop.org/xorg/xserver/xorg/hw/xfree86/common/xf86Globals.c
  1.29          +5 -0      xserver/xorg/hw/xfree86/common/xf86Init.c
  http://cvs.freedesktop.org/xorg/xserver/xorg/hw/xfree86/common/xf86Init.c
  1.7           +1 -0      xserver/xorg/hw/xfree86/common/xf86Priv.h
  http://cvs.freedesktop.org/xorg/xserver/xorg/hw/xfree86/common/xf86Priv.h
  1.11          +3 -2      xserver/xorg/hw/xfree86/os-support/linux/lnx_apm.c
  http://cvs.freedesktop.org/xorg/xserver/xorg/hw/xfree86/os-support/linux/lnx_apm.c