[PULL 1.13] A few small fixes

[Matt Dew]

Jon,

   Ack'd.


Matt


On 10/16/2012 08:27 AM, Jon TURNEY wrote:
> On 11/10/2012 17:37, Keith Packard wrote:
>> Jon TURNEY writes:
>>
>>> Jon TURNEY (4):
>>>        Correct description of -displayfd option in man page.
>>>        hw/xwin: Only add GLX extension once.
>>>        Fix compilation of Xorg DDX without XF86VIDMODE
>>>        Fix 'make distcheck' for hw/xwin
>>
>> Merged.
>>     4b7f003..a69429a  master -> master
>>
>> Make sure you let Matt know which of these you'd like to see in a 1.13
>> stable update.
>>
>
> The following changes since commit f0bad69edd57facd6cffde8cb0863d1a735e2492:
>
>    Version bumped to 1.13 (2012-09-05 14:45:08 -0700)
>
> are available in the git repository at:
>
>    git://people.freedesktop.org/~jturney/xserver server-1.13-branch
>
> for you to fetch changes up to 0456d56092e7617131c77b50a7e7f501e6d9d275:
>
>    Fix 'make distcheck' for hw/xwin (2012-10-16 15:14:55 +0100)
>
> ----------------------------------------------------------------
> Jon TURNEY (4):
>        Correct description of -displayfd option in man page.
>        hw/xwin: Only add GLX extension once.
>        Fix compilation of Xorg DDX without XF86VIDMODE
>        Fix 'make distcheck' for hw/xwin
>
>   hw/xfree86/common/Makefile.am |    3 ++-
>   hw/xwin/InitOutput.c          |    5 +++--
>   hw/xwin/Makefile.am           |    3 +++
>   hw/xwin/glx/Makefile.am       |    3 ++-
>   man/Xserver.man               |    2 +-
>   5 files changed, 11 insertions(+), 5 deletions(-)
>