| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
|\| |
|
| | |
|
|\|
| |
| |
| |
| | |
Conflicts:
mesalib/src/mesa/swrast/s_readpix.c
|
| | |
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
mesalib/src/mesa/drivers/dri/swrast/swrast_priv.h
xorg-server/hw/xwin/InitOutput.c
xorg-server/hw/xwin/ddraw.h
xorg-server/hw/xwin/winclipboardwndproc.c
xorg-server/hw/xwin/winglobals.c
xorg-server/hw/xwin/winmonitors.c
xorg-server/hw/xwin/winprocarg.c
xorg-server/hw/xwin/winwin32rootlesswndproc.c
xorg-server/include/scrnintstr.h
xorg-server/xkb/ddxList.c
xorg-server/xkb/ddxLoad.c
|
| | |
|
|\| |
|
| | |
|
|\|
| |
| |
| |
| | |
Conflicts:
xorg-server/include/os.h
|
| |
| |
| |
| | |
xkeyboard-config git update 19 oct 2011
|
| | |
|
|\|
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
mesalib/src/mapi/glapi/glapi.h
mesalib/src/mesa/main/syncobj.h
xorg-server/dix/events.c
xorg-server/dix/getevents.c
xorg-server/include/misc.h
|
| |
| |
| |
| | |
update 5 oct 2011
|
| | |
|
|\|
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
mesalib/src/mesa/main/version.c
xorg-server/include/globals.h
xorg-server/mi/misprite.c
xorg-server/mi/mivaltree.c
xorg-server/os/utils.c
|
| | |
|
| | |
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
xorg-server/Xext/dpms.c
xorg-server/Xext/saver.c
xorg-server/Xext/security.c
xorg-server/Xext/shape.c
xorg-server/Xext/sync.c
xorg-server/Xi/opendev.c
xorg-server/fb/wfbrename.h
xorg-server/glx/glxserver.h
xorg-server/hw/xwin/winwindowswm.c
xorg-server/mi/miarc.c
xorg-server/mi/miwideline.c
xorg-server/os/io.c
xorg-server/render/mipict.c
|
| | |
|
| | |
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
mesalib/src/glsl/link_functions.cpp
mesalib/src/glsl/linker.cpp
mesalib/src/glsl/main.cpp
mesalib/src/mesa/program/ir_to_mesa.cpp
xorg-server/composite/compalloc.c
xorg-server/configure.ac
xorg-server/hw/xquartz/X11Application.m
xorg-server/hw/xquartz/bundle/Makefile.am
xorg-server/hw/xquartz/xpr/xprFrame.c
xorg-server/include/windowstr.h
|
| | |
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
mesalib/src/glsl/ast_function.cpp
mesalib/src/glsl/glsl_types.cpp
mesalib/src/mesa/main/teximage.c
mesalib/src/mesa/main/texparam.c
xorg-server/config/udev.c
xorg-server/configure.ac
xorg-server/dix/main.c
xorg-server/hw/dmx/dmxinit.c
xorg-server/hw/kdrive/src/kdrive.c
xorg-server/hw/xfree86/common/xf86Config.c
xorg-server/hw/xfree86/common/xf86Configure.c
xorg-server/hw/xfree86/common/xf86Helper.c
xorg-server/hw/xfree86/common/xf86Init.c
xorg-server/hw/xfree86/common/xf86Option.c
xorg-server/hw/xfree86/common/xf86Priv.h
xorg-server/hw/xfree86/common/xf86Xinput.c
xorg-server/hw/xnest/Init.c
xorg-server/hw/xquartz/darwin.c
xorg-server/hw/xwin/InitOutput.c
xorg-server/hw/xwin/winerror.c
xorg-server/hw/xwin/xlaunch/config.cc
xorg-server/hw/xwin/xlaunch/config.h
xorg-server/hw/xwin/xlaunch/main.cc
xorg-server/hw/xwin/xlaunch/resources/dialog.rc
xorg-server/hw/xwin/xlaunch/resources/resources.h
xorg-server/hw/xwin/xlaunch/resources/resources.rc
xorg-server/hw/xwin/xlaunch/resources/strings.rc
xorg-server/hw/xwin/xlaunch/window/util.cc
xorg-server/hw/xwin/xlaunch/window/util.h
xorg-server/hw/xwin/xlaunch/window/wizard.h
xorg-server/include/os.h
xorg-server/os/log.c
xorg-server/xkeyboard-config/symbols/lv
|
| | |
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
mesalib/common.py
mesalib/docs/GL3.txt
mesalib/scons/custom.py
mesalib/scons/gallium.py
mesalib/src/SConscript
xorg-server/Xext/xtest.c
xorg-server/dix/getevents.c
xorg-server/dix/window.c
xorg-server/exa/exa_accel.c
xorg-server/exa/exa_migration_classic.c
xorg-server/exa/exa_unaccel.c
xorg-server/hw/kdrive/ephyr/ephyr.c
xorg-server/hw/kdrive/ephyr/ephyr.h
xorg-server/hw/kdrive/ephyr/ephyrinit.c
xorg-server/hw/kdrive/ephyr/hostx.c
xorg-server/hw/kdrive/src/kdrive.h
xorg-server/hw/kdrive/src/kinput.c
xorg-server/hw/xfree86/common/xf86Init.c
xorg-server/hw/xfree86/dri2/dri2.c
xorg-server/hw/xnest/Init.c
xorg-server/hw/xquartz/darwin.c
xorg-server/hw/xquartz/darwinEvents.c
xorg-server/hw/xquartz/darwinEvents.h
xorg-server/hw/xquartz/darwinXinput.c
xorg-server/hw/xwin/InitInput.c
xorg-server/include/input.h
xorg-server/include/window.h
xorg-server/mi/mipointer.c
xorg-server/test/Makefile.am
xorg-server/test/xi2/protocol-eventconvert.c
|
| | |
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
mesalib/docs/news.html
mesalib/docs/relnotes.html
mesalib/src/mesa/state_tracker/st_atom_blend.c
mesalib/src/mesa/state_tracker/st_draw.c
xorg-server/Xi/exevents.c
xorg-server/dix/events.c
xorg-server/include/dix.h
|
| | |
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
mesalib/configs/linux-dri
mesalib/src/gallium/auxiliary/util/u_math.h
mesalib/src/mapi/glapi/gen/Makefile
mesalib/src/mapi/glapi/glapi_mapi_tmp.h
mesalib/src/mapi/glapi/glapi_sparc.S
mesalib/src/mapi/glapi/glapi_x86-64.S
mesalib/src/mapi/glapi/glapi_x86.S
mesalib/src/mapi/glapi/glapitable.h
mesalib/src/mapi/glapi/glapitemp.h
mesalib/src/mapi/glapi/glprocs.h
mesalib/src/mesa/drivers/dri/Makefile.template
mesalib/src/mesa/main/dd.h
mesalib/src/mesa/main/fbobject.c
mesalib/src/mesa/main/remap_helper.h
mesalib/src/mesa/main/shaderapi.c
mesalib/src/mesa/main/teximage.c
mesalib/src/mesa/main/uniforms.c
mesalib/src/mesa/state_tracker/st_format.c
mesalib/src/mesa/vbo/vbo_exec_array.c
xorg-server/configure.ac
xorg-server/dix/main.c
xorg-server/dix/window.c
xorg-server/hw/xquartz/GL/indirect.c
xorg-server/hw/xquartz/X11Application.m
xorg-server/hw/xquartz/darwin.c
xorg-server/hw/xquartz/darwin.h
xorg-server/hw/xquartz/mach-startup/Makefile.am
xorg-server/hw/xquartz/pbproxy/app-main.m
xorg-server/hw/xquartz/pbproxy/pbproxy.h
xorg-server/hw/xquartz/pbproxy/x-selection.m
xorg-server/hw/xquartz/xpr/xpr.h
xorg-server/hw/xquartz/xpr/xprEvent.c
xorg-server/hw/xquartz/xpr/xprScreen.c
xorg-server/include/privates.h
xorg-server/include/protocol-versions.h
xorg-server/test/Makefile.am
xorg-server/xfixes/cursor.c
xorg-server/xfixes/xfixes.c
xorg-server/xkeyboard-config/configure.in
xorg-server/xkeyboard-config/rules/base.extras.xml.in
xorg-server/xkeyboard-config/rules/base.xml.in
xorg-server/xkeyboard-config/symbols/de
xorg-server/xkeyboard-config/symbols/lk
xorg-server/xkeyboard-config/symbols/ru
|
| | |
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
libX11/specs/libX11/CH08.xml
mesalib/src/mesa/main/dlist.c
mesalib/src/mesa/main/fbobject.c
mesalib/src/mesa/main/queryobj.c
mesalib/src/mesa/main/shaderapi.c
mesalib/src/mesa/main/teximage.c
mesalib/src/mesa/program/ir_to_mesa.cpp
mesalib/src/mesa/state_tracker/st_atom_pixeltransfer.c
mesalib/src/mesa/state_tracker/st_cb_bufferobjects.c
mesalib/src/mesa/state_tracker/st_cb_drawpixels.c
mesalib/src/mesa/state_tracker/st_cb_readpixels.c
mesalib/src/mesa/state_tracker/st_cb_texture.c
mkfontscale/list.h
pixman/pixman/Makefile.win32
xorg-server/dix/devices.c
xorg-server/dix/events.c
xorg-server/dix/inpututils.c
xorg-server/fb/fbbltone.c
xorg-server/hw/kdrive/ephyr/ephyr.c
xorg-server/hw/kdrive/ephyr/ephyrinit.c
xorg-server/hw/xfree86/common/xf86Module.h
xorg-server/hw/xfree86/common/xf86Xinput.c
xorg-server/hw/xfree86/man/xorg.conf.man
xorg-server/hw/xwin/winkeybd.c
xorg-server/hw/xwin/winmouse.c
xorg-server/include/input.h
xorg-server/include/inputstr.h
xorg-server/mi/mieq.c
xorg-server/randr/rrscreen.c
xorg-server/xkeyboard-config/rules/base.extras.xml.in
xorg-server/xkeyboard-config/rules/base.xml.in
|
| | |
|
|\| |
|
| | |
|
|\| |
|
| | |
|
|\| |
|
| | |
|
|\| |
|
| | |
|
|\| |
|
| | |
|
|\| |
|
| | |
|
| | |
|
|\| |
|
| | |
|
|\| |
|
| | |
|
| |
| |
| |
| |
| | |
Enabled IPV6 compilation
|