Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/released' | marha | 2011-12-14 | 18 | -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 2011 | marha | 2011-12-14 | 6 | -2056/+2072 |
| | | |||||
| * | git update pixman mesa 13 dec 2011 | marha | 2011-12-13 | 13 | -157/+196 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-12 | 46 | -3663/+5438 |
|\| | |||||
| * | libxtrans libX11 libxcb xserver mesa git update 12 dec 2011 | marha | 2011-12-12 | 46 | -3663/+5438 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-08 | 4 | -7/+28 |
|\| | |||||
| * | git update glproto libX11 libxcb mesa xserver 8 dec 2011 | marha | 2011-12-08 | 4 | -7/+28 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-05 | 41 | -6324/+6689 |
|\| | | | | | | | | | Conflicts: xorg-server/dix/dispatch.c | ||||
| * | xserver xkeyboard-config mesa git update 5 dec 2011 | marha | 2011-12-05 | 41 | -6324/+6689 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-29 | 50 | -1361/+1505 |
|\| | |||||
| * | mesa git update 29 nov 2011 | marha | 2011-11-29 | 50 | -1361/+1505 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-28 | 10 | -1173/+1313 |
|\| | |||||
| * | mesa git update 28 nov 2011 | marha | 2011-11-28 | 10 | -1173/+1313 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-25 | 15 | -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 2011 | marha | 2011-11-25 | 15 | -112/+185 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-21 | 9 | -170/+218 |
|\| | |||||
| * | xserver xkeyboard-config mesa git update 21 nov 2011 | marha | 2011-11-21 | 9 | -170/+218 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-17 | 37 | -4926/+4033 |
|\| | | | | | | | | | Conflicts: mesalib/src/mesa/swrast/s_readpix.c | ||||
| * | xserver mesa git update 17 nov 2011 | marha | 2011-11-17 | 37 | -4926/+4033 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-14 | 18 | -1225/+968 |
|\| | | | | | | | | | Conflicts: libX11/src/util/makekeys.c | ||||
| * | libX11 libXext libXinerama libXmu libfontenc libxcb mesa pixman git update | marha | 2011-11-14 | 18 | -1225/+968 |
| | | | | | | | | 14 nov 2011 | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-10 | 5 | -10/+263 |
|\| | |||||
| * | libX11 mesa git update 10 nov 2011 | marha | 2011-11-10 | 5 | -10/+263 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-09 | 37 | -1386/+1699 |
|\| | | | | | | | | | Conflicts: mesalib/src/mapi/glapi/glapi.h | ||||
| * | libX11 mesa pixman git update 9 nov 2011 | marha | 2011-11-09 | 37 | -1386/+1699 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-07 | 15 | -601/+440 |
|\| | | | | | | | | | Conflicts: pixman/pixman/pixman-mmx.c | ||||
| * | xserver pixman mesa git update 7 nov 2011 | marha | 2011-11-07 | 15 | -601/+440 |
| | | |||||
* | | Solved mesa compile problems | marha | 2011-11-04 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-04 | 78 | -10693/+8923 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | xserver pixman mesa git update 4 nov 2011 | marha | 2011-11-04 | 78 | -10686/+8916 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-10-28 | 6 | -946/+979 |
|\| | |||||
| * | mesa git update 28 okt 2011 | marha | 2011-10-28 | 6 | -946/+979 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-10-27 | 45 | -451/+952 |
|\| | |||||
| * | mesa git update 27 okt 2011 | marha | 2011-10-27 | 7 | -61/+99 |
| | | |||||
| * | libX11 libXft mesa mkfontscale pixman xserver git update 26 okt 2011 | marha | 2011-10-26 | 43 | -390/+853 |
| | | |||||
* | | Removed useless code | marha | 2011-10-27 | 1 | -2/+0 |
| | | |||||
* | | Solved link problems | marha | 2011-10-19 | 1 | -0/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-10-19 | 45 | -1605/+1382 |
|\| | | | | | | | | | Conflicts: xorg-server/include/os.h | ||||
| * | libX11 libXext libXft mesa libxcb mkfontscale pixman xserver | marha | 2011-10-19 | 45 | -1605/+1382 |
| | | | | | | | | xkeyboard-config git update 19 oct 2011 | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-10-10 | 34 | -513/+888 |
|\| | |||||
| * | fontconfig libX11 mesa pixman xkeyboard-config git updte 10 oct 2011 | marha | 2011-10-10 | 34 | -513/+888 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-10-06 | 13 | -519/+611 |
|\| | |||||
| * | upgraded to inputproto-2.1.99.1 | marha | 2011-10-06 | 13 | -519/+611 |
| | | | | | | | | xwininfo fontconfig libXau mesa xkeyboard-config git update 6 oct 2011 | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-10-05 | 118 | -10639/+11410 |
|\| | | | | | | | | | | | | | | | | | 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 | ||||
| * | mkfontscale pixman xserver xtrans libX11 libXdmcp libxcb libXmu mesa git ↵ | marha | 2011-10-05 | 118 | -10639/+11410 |
| | | | | | | | | update 5 oct 2011 | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-09-30 | 14 | -286/+92 |
|\| | | | | | | | | | Conflicts: openssl/Makefile | ||||
| * | mesa xkeyboard-config git update 30 sep 2011 | marha | 2011-09-30 | 14 | -286/+92 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-09-29 | 9 | -13/+84 |
|\| | |||||
| * | xwininfo libXft mesa git update 29 sep 2011 | marha | 2011-09-29 | 9 | -13/+84 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-09-28 | 6 | -129/+197 |
|\| |