aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2012-08-016-18/+261
|\
| * git mesa update 1 Aug 2012marha2012-08-016-18/+261
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-3191-2316/+2966
|\|
| * fontconfig libXext mesa xserver pixman git update 31 Jul 2012marha2012-07-3191-2316/+2966
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-186-5/+81
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-186-5/+81
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-166-62/+84
|\| | | | | | | | | | | Conflicts: mesalib/src/glsl/.gitignore mesalib/src/glsl/glcpp/.gitignore
| * libX11 mesa git update 16 Jul 2012marha2012-07-166-62/+84
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-1325-76/+466
|\| | | | | | | | | | | Conflicts: xorg-server/glx/glxext.c xorg-server/hw/xwin/InitOutput.c
| * xserver mesa git update 13 Jul 2012marha2012-07-1325-76/+466
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-121-1/+1
|\|
| * mesa xserver git update 12 Jul 2012marha2012-07-121-1/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-118-9/+138
|\| | | | | | | | | Conflicts: xorg-server/dix/devices.c
| * mesa xserver pixman git update 11 Jul 2012marha2012-07-118-9/+138
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-066-21/+11
|\| | | | | | | | | | | | | | | 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-066-21/+11
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-044-14/+40
|\| | | | | | | | | | | Conflicts: xorg-server/include/misc.h xorg-server/os/utils.c
| * mesa xserver git update 4 Jul 2012marha2012-07-044-14/+40
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-022-13/+3
|\| | | | | | | | | Conflicts: pixman/pixman/pixman-sse2.c
| * mesa pixman xserver git update 2 Jul 2012marha2012-07-022-13/+3
| |
* | 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-2820-103/+172
|\|
| * xkeyboard-config mesa fontconfig randrproto git update 28 Jun 2012marha2012-06-2820-103/+172
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-2223-399/+647
|\| | | | | | | | | Conflicts: mesalib/src/mapi/glapi/gen/.gitignore
| * mesa xserver libxcb fontconfigmarha2012-06-2223-399/+647
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-2114-60/+217
|\|
| * mesa pixman xkeyboard-config xserver git update 21 Jun 2012marha2012-06-2114-60/+217
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-194-6/+41
|\|
| * mesa git update 19 Juni 2012marha2012-06-194-6/+41
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-186-77/+147
|\|
| * fontconfig mesa pixman git update 18 Jun 2012marha2012-06-186-77/+147
| |
* | 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
|\|