aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2012-07-1811-32/+109
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/glsl/.gitignore xorg-server/Xext/panoramiX.c xorg-server/hw/xwin/win.h xorg-server/hw/xwin/winclipboardinit.c xorg-server/hw/xwin/winclipboardthread.c xorg-server/hw/xwin/winclipboardunicode.c xorg-server/hw/xwin/winclipboardwrappers.c xorg-server/hw/xwin/winclipboardxevents.c xorg-server/hw/xwin/wincreatewnd.c xorg-server/hw/xwin/windialogs.c xorg-server/hw/xwin/winerror.c xorg-server/hw/xwin/winmonitors.c xorg-server/hw/xwin/winmultiwindowwm.c xorg-server/hw/xwin/winprocarg.c xorg-server/hw/xwin/winwndproc.c
| * fontconfig mesa xserver git update 18 Jul 2012marha2012-07-1811-32/+109
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-1616-286/+329
|\| | | | | | | | | | | Conflicts: mesalib/src/glsl/.gitignore mesalib/src/glsl/glcpp/.gitignore
| * libX11 mesa git update 16 Jul 2012marha2012-07-1616-286/+329
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-1339-286/+1222
|\| | | | | | | | | | | Conflicts: xorg-server/glx/glxext.c xorg-server/hw/xwin/InitOutput.c
| * xserver mesa git update 13 Jul 2012marha2012-07-1339-286/+1222
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-124-79/+103
|\|
| * mesa xserver git update 12 Jul 2012marha2012-07-124-79/+103
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-119-10/+159
|\| | | | | | | | | Conflicts: xorg-server/dix/devices.c
| * mesa xserver pixman git update 11 Jul 2012marha2012-07-119-10/+159
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-118-67/+205
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: xorg-server/Xext/shm.c xorg-server/Xext/sync.c xorg-server/Xext/xf86bigfont.c xorg-server/Xi/opendev.c xorg-server/dix/dispatch.c xorg-server/include/globals.h xorg-server/mi/miinitext.c
| * fontconfig mesa xserver git update 10 Jul 2012marha2012-07-108-67/+205
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-068-31/+19
|\| | | | | | | | | | | | | | | Conflicts: xorg-server/dix/dispatch.c xorg-server/dix/privates.c xorg-server/hw/kdrive/ephyr/ephyr.c xorg-server/hw/kdrive/src/kinput.c
| * randrproto fontconfig mesa xserver git update 6 Jul 2012marha2012-07-068-31/+19
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-049-46/+76
|\| | | | | | | | | | | Conflicts: xorg-server/include/misc.h xorg-server/os/utils.c
| * mesa xserver git update 4 Jul 2012marha2012-07-049-46/+76
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-0213-243/+252
|\| | | | | | | | | Conflicts: pixman/pixman/pixman-sse2.c
| * mesa pixman xserver git update 2 Jul 2012marha2012-07-0213-243/+252
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-2910-60/+107
|\| | | | | | | | | | | Conflicts: xorg-server/hw/xwin/glx/gen_gl_wrappers.py xorg-server/hw/xwin/glx/indirect.c
| * xkeyboard-config xserver pixman mesa git update 29 Jun 2012marha2012-06-2910-60/+107
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-2835-170/+322
|\|
| * xkeyboard-config mesa fontconfig randrproto git update 28 Jun 2012marha2012-06-2835-170/+322
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-2230-464/+822
|\| | | | | | | | | Conflicts: mesalib/src/mapi/glapi/gen/.gitignore
| * mesa xserver libxcb fontconfigmarha2012-06-2230-442/+800
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-2117-61/+260
|\|
| * mesa pixman xkeyboard-config xserver git update 21 Jun 2012marha2012-06-2117-61/+260
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-196-6/+50
|\|
| * mesa git update 19 Juni 2012marha2012-06-196-6/+50
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-1811-79/+161
|\|
| * fontconfig mesa pixman git update 18 Jun 2012marha2012-06-1811-79/+161
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-1522-651/+1054
|\| | | | | | | | | | | | | | | 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-1522-651/+1054
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-1227-188/+204
|\|
| * fontconfig mesa pixman git update 12 Juni 2012marha2012-06-1227-188/+204
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-115-26/+25
|\| | | | | | | | | Conflicts: mesalib/src/glsl/glcpp/.gitignore
| * fontconfig glproto mesa pixman git update 11 Jun 2012marha2012-06-115-26/+25
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-08292-44315/+44761
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-08293-44326/+44786
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-0411-12/+107
|\|
| * fontconfig libX11 libXft mesa pixman xserver xkeyboard-config git update 4marha2012-06-0411-12/+107
| | | | | | | | May 2012
* | Update filesthatshouldbethesame.py and synchronised filesmarha2012-05-301-1/+1
| |
* | dispatch.h glapitable.h enums.c are now generated automaticallymarha2012-05-301-0/+3
| |
* | Only define INLINE when it is not defined yetmarha2012-05-301-0/+2
| |
* | Merge remote-tracking branch 'origin/released'marha2012-05-3017-103983/+407
|\|
| * mesa xkeyboard-config git update 30 May 2012marha2012-05-3017-103983/+407
| |
* | Merge remote-tracking branch 'origin/released'marha2012-05-291-3/+3
|\| | | | | | | | | | | Conflicts: pixman/pixman/pixman-mmx.c xorg-server/Xext/hashtable.c
| * fontconfig libX11 mesa pixman xserver git update 29 May 2012marha2012-05-291-3/+3
| |
* | Merge remote-tracking branch 'origin/released'marha2012-05-2516-160/+273
|\|
| * fontconfig xserver xkeyboard-config pixman git update 2012marha2012-05-2516-160/+273
| |
* | Merge remote-tracking branch 'origin/released'marha2012-05-2127-682/+926
|\|