[Xf4vnc-cvs] CVS Update: modular (branch: trunk)
Brought to you by:
alanh
From: Alan H. <al...@us...> - 2008-03-09 10:32:43
|
CVSROOT: /cvsroot/xf4vnc Module name: modular Repository: modular/src/xserver/xkb/ Changes by: al...@sc... 08/03/09 03:32:44 Log message: Fix conflicts Modified files: modular/src/xserver/: configure.ac modular/src/xserver/GL/: symlink-mesa.sh modular/src/xserver/GL/glx/: Makefile.am glxcmds.c glxdri.c glxext.c glxext.h glxglcore.c glxscreens.h modular/src/xserver/GL/mesa/X/: Makefile.am modular/src/xserver/dix/: devices.c modular/src/xserver/hw/: Makefile.am modular/src/xserver/hw/dmx/: Makefile.am dmx-config.h dmx.h dmxcmap.c dmxcursor.c modular/src/xserver/hw/xfree86/: Makefile.am modular/src/xserver/hw/xfree86/common/: xf86.h modular/src/xserver/hw/xfree86/dixmods/: Makefile.am modular/src/xserver/include/: miscstruct.h modular/src/xserver/mi/: mieq.c miinitext.c modular/src/xserver/render/: picture.h Removed files: modular/src/xserver/GL/glx/: glxvisuals.c indirect_dispatch.c indirect_dispatch.h indirect_dispatch_swap.c indirect_reqsize.c indirect_reqsize.h indirect_size_get.c indirect_size_get.h indirect_table.c modular/src/xserver/Xext/: SecurityPolicy modular/src/xserver/afb/: afbbstore.c afbpntwin.c modular/src/xserver/cfb/: cfbbstore.c cfbpntwin.c cfbtab.h modular/src/xserver/doc/: SecurityPolicy.man.pre modular/src/xserver/fb/: fbbstore.c modular/src/xserver/hw/darwin/: Makefile.am README.apple XDarwin.man darwin.c darwin.h darwinClut8.h darwinEvents.c darwinKeyboard.c darwinKeyboard.h darwinXinput.c modular/src/xserver/hw/darwin/apple/: Info.plist X11.icns X11Application.h X11Application.m X11Controller.h X11Controller.m Xquartz.man bundle-main.c modular/src/xserver/hw/darwin/apple/English.lproj/: InfoPlist.strings modular/src/xserver/hw/darwin/apple/English.lproj/main.nib/: classes.nib info.nib keyedobjects.nib modular/src/xserver/hw/darwin/apple/English.lproj/main.nib/.svn/: entries format modular/src/xserver/hw/darwin/apple/English.lproj/main.nib/.svn/prop-base/: keyedobjects.nib.svn-base modular/src/xserver/hw/darwin/apple/English.lproj/main.nib/.svn/text-base/: classes.nib.svn-base info.nib.svn-base keyedobjects.nib.svn-base modular/src/xserver/hw/darwin/apple/X11.xcodeproj/: project.pbxproj modular/src/xserver/hw/darwin/bundle/: Info.plist Makefile.am XDarwin.icns startXClients.cpp modular/src/xserver/hw/darwin/bundle/Dutch.lproj/: Credits.rtf Localizable.strings Makefile.am XDarwinHelp.html.cpp modular/src/xserver/hw/darwin/bundle/Dutch.lproj/MainMenu.nib/: classes.nib objects.nib modular/src/xserver/hw/darwin/bundle/English.lproj/: Credits.rtf InfoPlist.strings.cpp Localizable.strings Makefile.am XDarwinHelp.html.cpp modular/src/xserver/hw/darwin/bundle/English.lproj/MainMenu.nib/: classes.nib objects.nib modular/src/xserver/hw/darwin/bundle/French.lproj/: Credits.rtf Localizable.strings Makefile.am XDarwinHelp.html.cpp modular/src/xserver/hw/darwin/bundle/French.lproj/MainMenu.nib/: classes.nib objects.nib modular/src/xserver/hw/darwin/bundle/German.lproj/: Credits.rtf Localizable.strings Makefile.am XDarwinHelp.html.cpp modular/src/xserver/hw/darwin/bundle/German.lproj/MainMenu.nib/: classes.nib objects.nib modular/src/xserver/hw/darwin/bundle/Japanese.lproj/: Credits.rtf Localizable.strings Makefile.am XDarwinHelp.html.cpp modular/src/xserver/hw/darwin/bundle/Japanese.lproj/MainMenu.nib/: classes.nib objects.nib modular/src/xserver/hw/darwin/bundle/Portuguese.lproj/: Credits.rtf Localizable.strings Makefile.am XDarwinHelp.html.cpp modular/src/xserver/hw/darwin/bundle/Portuguese.lproj/MainMenu.nib/: classes.nib objects.nib modular/src/xserver/hw/darwin/bundle/Spanish.lproj/: Credits.rtf Localizable.strings Makefile.am XDarwinHelp.html.cpp modular/src/xserver/hw/darwin/bundle/Spanish.lproj/MainMenu.nib/: classes.nib objects.nib modular/src/xserver/hw/darwin/bundle/Swedish.lproj/: Credits.rtf Localizable.strings Makefile.am XDarwinHelp.html.cpp modular/src/xserver/hw/darwin/bundle/Swedish.lproj/MainMenu.nib/: classes.nib objects.nib modular/src/xserver/hw/darwin/bundle/ko.lproj/: Credits.rtf Localizable.strings Makefile.am XDarwinHelp.html.cpp modular/src/xserver/hw/darwin/bundle/ko.lproj/MainMenu.nib/: classes.nib objects.nib modular/src/xserver/hw/darwin/iokit/: Makefile.am xfIOKit.c xfIOKit.h xfIOKitCursor.c xfIOKitStartup.c modular/src/xserver/hw/darwin/quartz/: Makefile.am Preferences.h Preferences.m XApplication.h XApplication.m XDarwinStartup.c XDarwinStartup.man XServer.h XServer.m applewm.c applewmExt.h keysym2ucs.c keysym2ucs.h pseudoramiX.c pseudoramiX.h quartz.c quartz.h quartzAudio.c quartzAudio.h quartzCocoa.m quartzCommon.h quartzCursor.c quartzCursor.h quartzKeyboard.c quartzPasteboard.c quartzPasteboard.h quartzStartup.c modular/src/xserver/hw/darwin/quartz/XDarwin.pbproj/: project.pbxproj modular/src/xserver/hw/darwin/quartz/cr/: XView.h XView.m cr.h crAppleWM.m crFrame.m crScreen.m modular/src/xserver/hw/darwin/quartz/fullscreen/: fullscreen.c quartzCursor.c quartzCursor.h modular/src/xserver/hw/darwin/quartz/xpr/: Xplugin.h appledri.c appledri.h appledristr.h dri.c dri.h dristruct.h x-hash.c x-hash.h x-hook.c x-hook.h x-list.c x-list.h xpr.h xprAppleWM.c xprCursor.c xprFrame.c xprScreen.c modular/src/xserver/hw/darwin/utils/: Makefile.am README.txt dumpkeymap.c dumpkeymap.man modular/src/xserver/hw/kdrive/ati/: ChangeLog modular/src/xserver/hw/kdrive/neomagic/: ChangeLog backend.c backend.h modular/src/xserver/hw/xfree86/common/: modeline2c.pl xf86DefModes.c xf86DoScanPci.c xf86cvt.c modular/src/xserver/hw/xfree86/dixmods/: type1mod.c modular/src/xserver/hw/xfree86/dummylib/: xf86getpagesize.c modular/src/xserver/hw/xfree86/int10/: pci.c modular/src/xserver/hw/xfree86/os-support/: xf86_ansic.h xf86_libc.h modular/src/xserver/hw/xfree86/os-support/bus/: freebsdPci.c netbsdPci.c modular/src/xserver/hw/xfree86/os-support/shared/: libc_wrapper.c stdPci.c modular/src/xserver/hw/xfree86/scanpci/: Makefile.am extrapci.ids pci.ids pciid2c.pl xf86PciData.h xf86PciStdIds.h xf86PciStr.h xf86ScanPci.c xf86ScanPci.h modular/src/xserver/hw/xfree86/utils/pcitweak/: .gitignore Makefile.am pcitweak.c pcitweak.man.pre modular/src/xserver/hw/xfree86/utils/scanpci/: .gitignore Makefile.am scanpci.c scanpci.man.pre modular/src/xserver/hw/xfree86/xaa/: xaaPaintWin.c modular/src/xserver/hw/xfree86/xf4bpp/: ppcBStore.c ppcPntWin.c modular/src/xserver/hw/xfree86/xf8_32bpp/: cfbbstore.c modular/src/xserver/hw/xgl/: xglbstore.c modular/src/xserver/hw/xwin/: winpntwin.c modular/src/xserver/mfb/: mfbbstore.c mfbpntwin.c modular/src/xserver/miext/rootless/safeAlpha/: safeAlphaWindow.c modular/src/xserver/os/: secauth.c xalloc.c modular/src/xserver/render/: miglyph.c modular/src/xserver/xkb/: xkberrs.c Revision Changes Path 1.14 +435 -377 modular/src/xserver/configure.ac 1.3 +8 -0 modular/src/xserver/GL/symlink-mesa.sh 1.4 +13 -11 modular/src/xserver/GL/glx/Makefile.am 1.4 +523 -616 modular/src/xserver/GL/glx/glxcmds.c 1.4 +379 -449 modular/src/xserver/GL/glx/glxdri.c 1.4 +92 -161 modular/src/xserver/GL/glx/glxext.c 1.4 +0 -38 modular/src/xserver/GL/glx/glxext.h 1.3 +120 -93 modular/src/xserver/GL/glx/glxglcore.c 1.3 +26 -14 modular/src/xserver/GL/glx/glxscreens.h 1.3 +16 -22 modular/src/xserver/GL/mesa/X/Makefile.am 1.4 +145 -83 modular/src/xserver/dix/devices.c 1.4 +4 -13 modular/src/xserver/hw/Makefile.am 1.8 +9 -8 modular/src/xserver/hw/dmx/Makefile.am 1.4 +0 -2 modular/src/xserver/hw/dmx/dmx-config.h 1.5 +0 -2 modular/src/xserver/hw/dmx/dmx.h 1.4 +0 -14 modular/src/xserver/hw/dmx/dmxcmap.c 1.5 +4 -4 modular/src/xserver/hw/dmx/dmxcursor.c 1.5 +16 -13 modular/src/xserver/hw/xfree86/Makefile.am 1.5 +17 -31 modular/src/xserver/hw/xfree86/common/xf86.h 1.7 +1 -5 modular/src/xserver/hw/xfree86/dixmods/Makefile.am 1.3 +2 -13 modular/src/xserver/include/miscstruct.h 1.5 +12 -9 modular/src/xserver/mi/mieq.c 1.7 +25 -53 modular/src/xserver/mi/miinitext.c 1.3 +3 -3 modular/src/xserver/render/picture.h |