aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2012-01-2822-590/+988
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: xorg-server/hw/xwin/InitOutput.c xorg-server/hw/xwin/win.h 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/winengine.c xorg-server/hw/xwin/winkeybd.c xorg-server/hw/xwin/winkeybd.h xorg-server/hw/xwin/winkeynames.h xorg-server/hw/xwin/winmouse.c xorg-server/hw/xwin/winmultiwindowwm.c xorg-server/hw/xwin/winmultiwindowwndproc.c xorg-server/hw/xwin/winprefs.c xorg-server/hw/xwin/winwindow.h xorg-server/hw/xwin/winwndproc.c
| * mesa xserver git update 28 jan 2012marha2012-01-2822-590/+988
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-2624-616/+704
|\|
| * xwininfo xcb-proto mesa xserver git update 26 12 2012marha2012-01-2624-616/+704
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-2556-5451/+1309
|\|
| * mesa git update 25 jan 2012marha2012-01-2556-5451/+1309
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-245-4/+109
|\| | | | | | | | | Conflicts: xorg-server/dix/grabs.c
| * libX11 mesa xserver git update 24 jan 2012marha2012-01-245-4/+109
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-2315-484/+124
|\|
| * git update libX11 mesa libxcb xkeyboard-config 23 jan 2012marha2012-01-2315-484/+124
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-2020-265/+273
|\|
| * xserver xkeyboard-config git update 20 jan 2012marha2012-01-2020-265/+273
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-173-16/+10
|\|
| * git update mesa pixman xserver 17 jan 2012marha2012-01-173-16/+10
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-1346-540/+692
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: libxcb/src/xcb_auth.c libxcb/src/xcb_conn.c libxcb/src/xcb_out.c libxcb/src/xcb_util.c xorg-server/dix/dispatch.c xorg-server/include/dixstruct.h xorg-server/include/misc.h xorg-server/os/connection.c
| * libxtrans libXdmcp libxcb mesa xserver git update 13 jan 2012marha2012-01-1346-540/+692
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-1122-570/+1253
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: pixman/pixman/pixman-trap.c xorg-server/Xext/xace.c xorg-server/dix/dispatch.c xorg-server/hw/xwin/winclipboardthread.c xorg-server/hw/xwin/winengine.c xorg-server/hw/xwin/winwin32rootlesswindow.c xorg-server/include/dixstruct.h xorg-server/os/connection.c
| * mesa pixman xserver git update 11 jan 2012marha2012-01-1122-570/+1253
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-0925-984/+199
|\|
| * xwininfo libX11 mesa mkfontscale xkeyboard-config git update 9 jan 2011marha2012-01-0925-984/+199
| |
* | Solved compile problemmarha2012-01-061-1/+2
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-0648-1644/+1170
|\| | | | | | | | | | | Conflicts: mesalib/src/glsl/link_uniforms.cpp mesalib/src/mesa/drivers/dri/common/drisw_util.c
| * libX11 mesa pixman git update 6 jan 2012marha2012-01-0648-1645/+1171
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-2923-1066/+1030
|\|
| * xserver libX11 mesa xkeyboard-config git update 28 dec 2011marha2011-12-2823-1066/+1030
| |
* | Increaser version of swrastmarha2011-12-291-1/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-2540-6747/+3609
|\|
| * mesa xkeyboard-config xserver git update 25 dec 2011marha2011-12-2540-6747/+3609
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-2320-384/+656
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: xorg-server/glx/dispatch.h xorg-server/glx/glapi.c xorg-server/glx/indirect_dispatch.h xorg-server/glx/indirect_reqsize.c xorg-server/glx/indirect_reqsize.h xorg-server/glx/indirect_size.h xorg-server/glx/indirect_size_get.c xorg-server/glx/indirect_size_get.h xorg-server/glx/indirect_table.c xorg-server/mi/mieq.c
| * git mesa pixman xserver xkeyboard-config update 24 dec 2011marha2011-12-2320-384/+656
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-1748-824/+1178
|\|
| * libX11 libxtrans mesa xserver git update 17 dec 2011marha2011-12-1748-824/+1178
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-1418-2213/+2268
|\| | | | | | | | | | | | | | | | | Conflicts: mesalib/src/mapi/glapi/gen/EXT_gpu_shader4.xml mesalib/src/mapi/glapi/gen/glX_proto_recv.py mesalib/src/mapi/glapi/gen/glX_proto_size.py mesalib/src/mapi/glapi/gen/gl_gentable.py mesalib/src/mapi/glapi/gen/gl_table.py
| * git update mesa 14 dec 2011marha2011-12-146-2056/+2072
| |
| * git update pixman mesa 13 dec 2011marha2011-12-1313-157/+196
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-1246-3663/+5438
|\|
| * libxtrans libX11 libxcb xserver mesa git update 12 dec 2011marha2011-12-1246-3663/+5438
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-084-7/+28
|\|
| * git update glproto libX11 libxcb mesa xserver 8 dec 2011marha2011-12-084-7/+28
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-0541-6324/+6689
|\| | | | | | | | | Conflicts: xorg-server/dix/dispatch.c
| * xserver xkeyboard-config mesa git update 5 dec 2011marha2011-12-0541-6324/+6689
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-2950-1361/+1505
|\|
| * mesa git update 29 nov 2011marha2011-11-2950-1361/+1505
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-2810-1173/+1313
|\|
| * mesa git update 28 nov 2011marha2011-11-2810-1173/+1313
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-2515-112/+185
|\| | | | | | | | | | | | | | | | | | | Conflicts: xorg-server/glx/glxdriswrast.c xorg-server/glx/single2.c xorg-server/hw/xwin/winconfig.c xorg-server/os/osinit.c xorg-server/os/xdmcp.c xorg-server/xkb/xkbInit.c
| * mesa xserver pixman git update 25 nov 2011marha2011-11-2515-112/+185
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-219-170/+218
|\|
| * xserver xkeyboard-config mesa git update 21 nov 2011marha2011-11-219-170/+218
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-1737-4926/+4033
|\| | | | | | | | | Conflicts: mesalib/src/mesa/swrast/s_readpix.c