diff options
author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2007-09-26 07:47:29 -0400 |
---|---|---|
committer | Eamon Walsh <ewalsh@moss-charon.epoch.ncsc.mil> | 2007-09-26 07:47:29 -0400 |
commit | 27612748e0ec20f3a23839f0a12e39f598dd722c (patch) | |
tree | f7780ffd4d1284e76a17166f28211cfb88796de7 /hw/xnest | |
parent | b61461425eb15fcff2a58330d74fe5a5a1f226fc (diff) | |
parent | 3b114f2603fc2adeec7f5f8f20fe4870afb8dff1 (diff) |
Merge branch 'master' into XACE-SELINUX
Conflicts:
dix/devices.c
Diffstat (limited to 'hw/xnest')
-rw-r--r-- | hw/xnest/Init.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/hw/xnest/Init.c b/hw/xnest/Init.c index 324cf9696..a5f6c55af 100644 --- a/hw/xnest/Init.c +++ b/hw/xnest/Init.c @@ -127,22 +127,6 @@ void DarwinHandleGUI(int argc, char *argv[]) { } - -void GlxExtensionInit(); -void GlxWrapInitVisuals(void *procPtr); - -void -DarwinGlxExtensionInit() -{ - GlxExtensionInit(); -} - -void -DarwinGlxWrapInitVisuals( - void *procPtr) -{ - GlxWrapInitVisuals(procPtr); -} #endif void OsVendorInit() |