aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2012-06-1514-609/+722
|\ | | | | | | | | | | | | | | Conflicts: fontconfig/src/fcint.h fontconfig/src/fcstat.c mesalib/src/mapi/glapi/gen/GL3x.xml xorg-server/glx/glxext.h
| * fontconfig mesa pixman xserver git update 15 juni 2012marha2012-06-1514-609/+722
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-125-29/+48
|\|
| * fontconfig mesa pixman git update 12 Juni 2012marha2012-06-125-29/+48
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-111-10/+10
|\| | | | | | | | | Conflicts: mesalib/src/glsl/glcpp/.gitignore
| * fontconfig glproto mesa pixman git update 11 Jun 2012marha2012-06-111-10/+10
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-08177-31366/+30834
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: fontconfig/.gitignore libX11/src/ConvSel.c libX11/src/CrGlCur.c libX11/src/CrWindow.c libX11/src/GetDflt.c libX11/src/Window.c libX11/src/xlibi18n/XimProto.h libX11/src/xlibi18n/lcDynamic.c libxcb/src/.gitignore libxcb/src/xcb_ext.c libxcb/src/xcb_xid.c mesalib/src/glsl/.gitignore mesalib/src/glsl/glcpp/.gitignore mesalib/src/mapi/glapi/gen/glX_API.xml mesalib/src/mapi/glapi/glapi_getproc.c mesalib/src/mesa/main/.gitignore mesalib/src/mesa/main/syncobj.c mesalib/src/mesa/program/.gitignore xkbcomp/listing.c xkbcomp/xkbpath.c xorg-server/.gitignore xorg-server/Xext/xvmain.c xorg-server/dix/dispatch.c xorg-server/hw/xwin/glx/winpriv.h xorg-server/hw/xwin/winprefsyacc.y xorg-server/hw/xwin/winscrinit.c xorg-server/xkeyboard-config/rules/bin/ml1_s.sh xorg-server/xkeyboard-config/rules/bin/ml1v1_s.sh xorg-server/xkeyboard-config/rules/bin/ml1v_s.sh xorg-server/xkeyboard-config/rules/bin/ml_s.sh xorg-server/xkeyboard-config/rules/bin/mlv_s.sh xorg-server/xkeyboard-config/rules/compat/.gitignore
| * Used synchronise script to update filesmarha2012-06-08178-31366/+30840
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-046-8/+31
|\|
| * fontconfig libX11 libXft mesa pixman xserver xkeyboard-config git update 4marha2012-06-046-8/+31
| | | | | | | | May 2012
* | dispatch.h glapitable.h enums.c are now generated automaticallymarha2012-05-301-0/+3
| |
* | Merge remote-tracking branch 'origin/released'marha2012-05-307-25843/+402
|\|
| * mesa xkeyboard-config git update 30 May 2012marha2012-05-307-25843/+402
| |
* | Merge remote-tracking branch 'origin/released'marha2012-05-258-153/+53
|\|
| * fontconfig xserver xkeyboard-config pixman git update 2012marha2012-05-258-153/+53
| |
* | Merge remote-tracking branch 'origin/released'marha2012-05-2125-355/+527
|\|
| * fontconfig mesa xkeyboard-config xserver pixman git update 21 Mar 2012marha2012-05-2125-355/+527
| |
* | Merge remote-tracking branch 'origin/released'marha2012-05-1521-543/+570
|\|
| * xserver mesa git update 15 May 2012marha2012-05-152-2/+20
| |
| * fontconfig libX11 mesa xkeyboard-config pixman git update 14 May 2012marha2012-05-1419-541/+550
| |
* | Merge remote-tracking branch 'origin/released'marha2012-05-101-3/+1
|\| | | | | | | | | Conflicts: xorg-server/os/log.c
| * xserver fontconfig mesa git update 10 May 2012marha2012-05-101-3/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2012-05-0929-91/+263
|\|
| * libX11 mesa xserver xkeyboard-configmarha2012-05-0927-91/+217
| |
| * xserver mesa git update 3 May 2012marha2012-05-032-0/+46
| |
* | Merge remote-tracking branch 'origin/released'marha2012-05-021-0/+7
|\| | | | | | | | | Conflicts: xorg-server/os/connection.c
| * fontconfig mesa xserver xkeyboard-config git update 2 May 2012marha2012-05-021-0/+7
| |
* | Merge remote-tracking branch 'origin/released'marha2012-04-3010-38/+77
|\| | | | | | | | | | | Conflicts: pixman/pixman/pixman-mmx.c xorg-server/glx/glapi_gentable.c
| * fontconfig libX11 libfontenc mesa pixman xserver git update 30 Apr 2012marha2012-04-3010-38/+77
| |
* | Merge remote-tracking branch 'origin/released'marha2012-04-236-18/+10
|\|
| * fontconfig libXau libXext libxcb pixman mesa git update 23 April 2012marha2012-04-236-18/+10
| |
* | Merge remote-tracking branch 'origin/released'marha2012-04-2024-537/+457
|\| | | | | | | | | | | Conflicts: xorg-server/dix/dispatch.c xorg-server/dix/resource.c
| * fontconfig libX11 mesa pixman xserver git update 20 april 2012marha2012-04-2024-537/+457
| |
* | Merge remote-tracking branch 'origin/released'marha2012-04-172-63/+0
|\|
| * fontconfig mesa git update 17 Apr 2012marha2012-04-172-63/+0
| |
* | Merge remote-tracking branch 'origin/released'marha2012-04-1614-247/+250
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: xorg-server/Xext/securitysrv.h xorg-server/glx/glxext.h xorg-server/glx/indirect_reqsize.c xorg-server/glx/indirect_size_get.c xorg-server/hw/xwin/winclip.c xorg-server/hw/xwin/winfont.c xorg-server/hw/xwin/winglobals.c xorg-server/hw/xwin/winglobals.h xorg-server/hw/xwin/winmonitors.h xorg-server/include/closestr.h xorg-server/include/pixmapstr.h xorg-server/include/servermd.h xorg-server/include/site.h xorg-server/include/windowstr.h xorg-server/include/xkbstr.h
| * libX11 xserver pixman mesa git update 16 Apr 2012marha2012-04-1614-247/+250
| |
* | Merge remote-tracking branch 'origin/released'marha2012-04-135-1/+95
|\|
| * fontconfig xserver xkeyboard-config mesa git update 13 Apr 2012marha2012-04-135-1/+95
| |
* | Merge remote-tracking branch 'origin/released'marha2012-04-1014-3255/+3064
|\| | | | | | | | | Conflicts: xorg-server/os/log.c
| * fontconfig mesa xkeyboard-config xserver pixman git update 10 Apr 2012marha2012-04-1014-3255/+3064
| |
* | Merge remote-tracking branch 'origin/released'marha2012-03-286-6669/+6897
|\|
| * fontconfig libxcb xcb-proto mesa xserver git update 27 Mar 2012marha2012-03-276-6669/+6897
| |
* | Merge remote-tracking branch 'origin/released'marha2012-03-263-5/+20
|\|
| * fontconfig libxcb mesa xkeyboard-config git update 26 Mar 2012marha2012-03-263-5/+20
| |
* | Merge remote-tracking branch 'origin/released'marha2012-03-2625-330/+364
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: pixman/pixman/pixman-mmx.c xorg-server/Xext/shm.c xorg-server/Xext/syncsrv.h xorg-server/Xext/xvmain.c xorg-server/Xi/exevents.c xorg-server/Xi/opendev.c xorg-server/composite/compalloc.c xorg-server/composite/compoverlay.c xorg-server/dix/colormap.c xorg-server/dix/devices.c xorg-server/dix/dispatch.c xorg-server/dix/dixfonts.c xorg-server/dix/eventconvert.c xorg-server/dix/events.c xorg-server/dix/gc.c xorg-server/dix/getevents.c xorg-server/dix/main.c xorg-server/dix/privates.c xorg-server/dix/registry.c xorg-server/dix/resource.c xorg-server/exa/exa_accel.c xorg-server/exa/exa_migration_classic.c xorg-server/exa/exa_unaccel.c xorg-server/fb/fb.h xorg-server/fb/fbcopy.c xorg-server/fb/fbpixmap.c xorg-server/glx/dispatch.h xorg-server/glx/glapi.h xorg-server/glx/glapi_gentable.c xorg-server/glx/glapitable.h xorg-server/glx/glprocs.h xorg-server/glx/glxcmds.c xorg-server/glx/glxcmdsswap.c xorg-server/glx/glxdricommon.c xorg-server/glx/glxdriswrast.c xorg-server/glx/glxext.c xorg-server/glx/indirect_dispatch.c xorg-server/glx/indirect_dispatch.h xorg-server/glx/indirect_dispatch_swap.c xorg-server/glx/indirect_size.h xorg-server/glx/indirect_size_get.h xorg-server/glx/indirect_table.c xorg-server/glx/indirect_util.c xorg-server/glx/rensize.c xorg-server/glx/single2swap.c xorg-server/glx/singlepix.c xorg-server/glx/singlepixswap.c xorg-server/glx/singlesize.c xorg-server/hw/dmx/dmxinit.c xorg-server/hw/kdrive/ephyr/ephyr.c xorg-server/hw/kdrive/ephyr/hostx.c xorg-server/hw/kdrive/ephyr/hostx.h xorg-server/hw/kdrive/src/kinput.c xorg-server/hw/xfree86/common/compiler.h xorg-server/hw/xwin/InitInput.c xorg-server/hw/xwin/InitOutput.c xorg-server/hw/xwin/ddraw.h xorg-server/hw/xwin/glx/glwrap.c xorg-server/hw/xwin/glx/indirect.c xorg-server/hw/xwin/glx/wgl_ext_api.h xorg-server/hw/xwin/glx/winpriv.c xorg-server/hw/xwin/win.h xorg-server/hw/xwin/winallpriv.c xorg-server/hw/xwin/winauth.c xorg-server/hw/xwin/winclipboard.h xorg-server/hw/xwin/winclipboardinit.c xorg-server/hw/xwin/winclipboardthread.c xorg-server/hw/xwin/winclipboardunicode.c xorg-server/hw/xwin/winclipboardwndproc.c xorg-server/hw/xwin/winclipboardwrappers.c xorg-server/hw/xwin/winclipboardxevents.c xorg-server/hw/xwin/wincmap.c xorg-server/hw/xwin/winconfig.c xorg-server/hw/xwin/wincreatewnd.c xorg-server/hw/xwin/wincursor.c xorg-server/hw/xwin/windialogs.c xorg-server/hw/xwin/winengine.c xorg-server/hw/xwin/winerror.c xorg-server/hw/xwin/wingc.c xorg-server/hw/xwin/wingetsp.c xorg-server/hw/xwin/winkeybd.c xorg-server/hw/xwin/winkeybd.h xorg-server/hw/xwin/winlayouts.h xorg-server/hw/xwin/winmisc.c xorg-server/hw/xwin/winmonitors.c xorg-server/hw/xwin/winmouse.c xorg-server/hw/xwin/winmsg.c xorg-server/hw/xwin/winmsg.h xorg-server/hw/xwin/winmultiwindowclass.c xorg-server/hw/xwin/winmultiwindowicons.c xorg-server/hw/xwin/winmultiwindowshape.c xorg-server/hw/xwin/winmultiwindowwindow.c xorg-server/hw/xwin/winmultiwindowwm.c xorg-server/hw/xwin/winmultiwindowwndproc.c xorg-server/hw/xwin/winnativegdi.c xorg-server/hw/xwin/winpfbdd.c xorg-server/hw/xwin/winpixmap.c xorg-server/hw/xwin/winpolyline.c xorg-server/hw/xwin/winprefs.c xorg-server/hw/xwin/winprocarg.c xorg-server/hw/xwin/winregistry.c xorg-server/hw/xwin/winscrinit.c xorg-server/hw/xwin/winsetsp.c xorg-server/hw/xwin/winshaddd.c xorg-server/hw/xwin/winshadddnl.c xorg-server/hw/xwin/winshadgdi.c xorg-server/hw/xwin/wintrayicon.c xorg-server/hw/xwin/winwin32rootless.c xorg-server/hw/xwin/winwin32rootlesswindow.c xorg-server/hw/xwin/winwin32rootlesswndproc.c xorg-server/hw/xwin/winwindow.c xorg-server/hw/xwin/winwindow.h xorg-server/hw/xwin/winwindowswm.c xorg-server/hw/xwin/winwndproc.c xorg-server/include/callback.h xorg-server/include/dixstruct.h xorg-server/include/misc.h xorg-server/include/os.h xorg-server/include/scrnintstr.h xorg-server/mi/micmap.c xorg-server/mi/miinitext.c xorg-server/mi/mioverlay.c xorg-server/mi/misprite.c xorg-server/mi/mivaltree.c xorg-server/mi/miwindow.c xorg-server/miext/damage/damage.c xorg-server/miext/rootless/rootlessGC.c xorg-server/miext/rootless/rootlessWindow.c xorg-server/os/WaitFor.c xorg-server/os/access.c xorg-server/os/connection.c xorg-server/os/io.c xorg-server/os/log.c xorg-server/os/osinit.c xorg-server/os/utils.c xorg-server/os/xdmcp.c xorg-server/os/xprintf.c xorg-server/os/xstrans.c xorg-server/render/mipict.c xorg-server/xkb/xkbActions.c xorg-server/xkb/xkbInit.c xorg-server/xkeyboard-config/compat/default.in
| * libX11 xserver fontconfig mesa pixman xkbcomp xkeyboard-config git updatemarha2012-03-2325-330/+364
| | | | | | | | 23 Mar 2012
* | Merge remote-tracking branch 'origin/released'marha2012-03-1315-166/+57
|\|
| * fontconfig mesa git update 13 Mar 2012marha2012-03-1315-166/+57
| |
* | Merge remote-tracking branch 'origin/released'marha2012-03-1221-5998/+7178
|\| | | | | | | | | | | | | | | Conflicts: libX11/src/OpenDis.c libX11/src/xcb_io.c xorg-server/xkeyboard-config/keymap/sun_vndr/all.in xorg-server/xkeyboard-config/semantics/default.in
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 13:22:33 +0000