diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2007-09-19 07:25:55 -0400 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@moss-charon.epoch.ncsc.mil> | 2007-09-19 07:25:55 -0400 |
| commit | 97c150b61bbe436453b05d3c07cd2173870aac40 (patch) | |
| tree | 5335d0df93703e7ca8617cfae57315709d032a29 /hw/xnest/Screen.c | |
| parent | 57907e0943da0c3fd3bf6c128d210b544629ce72 (diff) | |
| parent | 547ad2125ece93bbe01f6d09a3baf176ebd16bb3 (diff) | |
Merge branch 'master' into XACE-SELINUX
Conflicts:
afb/afbpntwin.c
afb/afbscrinit.c
afb/afbwindow.c
cfb/cfb.h
cfb/cfballpriv.c
cfb/cfbscrinit.c
cfb/cfbwindow.c
configure.ac
fb/wfbrename.h
hw/xfree86/xf4bpp/ppcIO.c
hw/xfree86/xf4bpp/ppcPntWin.c
hw/xfree86/xf4bpp/ppcWindow.c
hw/xfree86/xf8_32bpp/cfbscrinit.c
mfb/mfb.h
mfb/mfbpntwin.c
mfb/mfbscrinit.c
mfb/mfbwindow.c
mi/miexpose.c
Note: conflicts caused by devPrivates rework vs. paintwindow changes.
Diffstat (limited to 'hw/xnest/Screen.c')
| -rw-r--r-- | hw/xnest/Screen.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/hw/xnest/Screen.c b/hw/xnest/Screen.c index f91454928..83590bced 100644 --- a/hw/xnest/Screen.c +++ b/hw/xnest/Screen.c @@ -284,8 +284,6 @@ xnestOpenScreen(int index, ScreenPtr pScreen, int argc, char *argv[]) pScreen->UnrealizeWindow = xnestUnrealizeWindow; pScreen->PostValidateTree = NULL; pScreen->WindowExposures = xnestWindowExposures; - pScreen->PaintWindowBackground = xnestPaintWindowBackground; - pScreen->PaintWindowBorder = xnestPaintWindowBorder; pScreen->CopyWindow = xnestCopyWindow; pScreen->ClipNotify = xnestClipNotify; |