~thopiekar/xorg-server/+git/xorg-xserver:glucose-2

Last commit made on 2008-08-20
Get this branch:
git clone -b glucose-2 https://git.launchpad.net/~thopiekar/xorg-server/+git/xorg-xserver

Branch merges

Branch information

Name:
glucose-2
Repository:
lp:~thopiekar/xorg-server/+git/xorg-xserver

Recent commits

9e7b299... by Alan Hourihane <email address hidden>

Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into glucose-2

Conflicts:

 configure.ac
 glx/glxcmds.c
 hw/xfree86/Makefile.am
 hw/xquartz/bundle/Resources/English.lproj/main.nib/designable.nib
 hw/xquartz/bundle/Resources/English.lproj/main.nib/keyedobjects.nib

2846c38... by Alan Hourihane <alanh@localhost.(none)>

use dixLookupPrivate

a710262... by Alan Hourihane <alanh@localhost.(none)>

more updates for recent glx changes

bede107... by Alan Hourihane <alanh@localhost.(none)>

Set the GLX screen on context creation

215a801... by Alan Hourihane <alanh@localhost.(none)>

update for recent glx changes

751c558... by Alan Hourihane <alanh@localhost.(none)>

Add GL extensions supported by glitz

fc92d5f... by Alan Hourihane <alanh@localhost.(none)>

add prototype

1d538d9... by Alan Hourihane <alanh@localhost.(none)>

Update XGL path Enter/Leave path

bc4cef1... by Maarten Maathuis

exa: remove useless cache{X,Y}off from UploadToScreen() arguments.

38bdc34... by Adam Jackson <email address hidden>

Remove redundant check.