Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/released' | marha | 2011-12-05 | 59 | -8612/+9014 |
|\ | | | | | | | | | Conflicts: xorg-server/dix/dispatch.c | ||||
| * | xserver xkeyboard-config mesa git update 5 dec 2011 | marha | 2011-12-05 | 59 | -8612/+9014 |
| | | |||||
* | | 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 | 13 | -1173/+1328 |
|\| | |||||
| * | mesa git update 28 nov 2011 | marha | 2011-11-28 | 13 | -1173/+1328 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-25 | 25 | -545/+648 |
|\| | | | | | | | | | | | | | | | | | | | 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 | 25 | -545/+648 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-21 | 13 | -225/+515 |
|\| | |||||
| * | xserver xkeyboard-config mesa git update 21 nov 2011 | marha | 2011-11-21 | 13 | -225/+515 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-17 | 45 | -5215/+4484 |
|\| | | | | | | | | | Conflicts: mesalib/src/mesa/swrast/s_readpix.c | ||||
| * | xserver mesa git update 17 nov 2011 | marha | 2011-11-17 | 45 | -5215/+4484 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-14 | 25 | -1343/+1079 |
|\| | | | | | | | | | Conflicts: libX11/src/util/makekeys.c | ||||
| * | libX11 libXext libXinerama libXmu libfontenc libxcb mesa pixman git update | marha | 2011-11-14 | 25 | -1343/+1079 |
| | | | | | | | | 14 nov 2011 | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-10 | 7 | -75/+773 |
|\| | |||||
| * | libX11 mesa git update 10 nov 2011 | marha | 2011-11-10 | 7 | -75/+773 |
| | | |||||
* | | Solved compile problem in debug | marha | 2011-11-10 | 1 | -2/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-09 | 53 | -1600/+2712 |
|\| | | | | | | | | | Conflicts: mesalib/src/mapi/glapi/glapi.h | ||||
| * | libX11 mesa pixman git update 9 nov 2011 | marha | 2011-11-09 | 53 | -1601/+2712 |
| | | |||||
* | | Synchronised files | marha | 2011-11-07 | 8 | -24/+49 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-07 | 19 | -2292/+2146 |
|\| | | | | | | | | | Conflicts: pixman/pixman/pixman-mmx.c | ||||
| * | xserver pixman mesa git update 7 nov 2011 | marha | 2011-11-07 | 19 | -2292/+2146 |
| | | |||||
* | | Solved mesa compile problems | marha | 2011-11-04 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-04 | 119 | -15378/+14368 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 119 | -15371/+14361 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-10-28 | 13 | -1189/+1276 |
|\| | |||||
| * | mesa git update 28 okt 2011 | marha | 2011-10-28 | 13 | -1189/+1276 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-10-27 | 64 | -665/+1434 |
|\| | |||||
| * | mesa git update 27 okt 2011 | marha | 2011-10-27 | 9 | -70/+108 |
| | | |||||
| * | libX11 libXft mesa mkfontscale pixman xserver git update 26 okt 2011 | marha | 2011-10-26 | 61 | -595/+1326 |
| | | |||||
* | | 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 | 62 | -3861/+3668 |
|\| | | | | | | | | | Conflicts: xorg-server/include/os.h | ||||
| * | libX11 libXext libXft mesa libxcb mkfontscale pixman xserver | marha | 2011-10-19 | 62 | -3861/+3668 |
| | | | | | | | | xkeyboard-config git update 19 oct 2011 | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-10-10 | 47 | -1943/+2976 |
|\| | |||||
| * | fontconfig libX11 mesa pixman xkeyboard-config git updte 10 oct 2011 | marha | 2011-10-10 | 47 | -1943/+2976 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-10-06 | 15 | -629/+734 |
|\| | |||||
| * | upgraded to inputproto-2.1.99.1 | marha | 2011-10-06 | 15 | -629/+734 |
| | | | | | | | | xwininfo fontconfig libXau mesa xkeyboard-config git update 6 oct 2011 | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-10-05 | 134 | -11035/+11918 |
|\| | | | | | | | | | | | | | | | | | 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 | 134 | -11035/+11918 |
| | | | | | | | | 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 | 11 | -14/+90 |
|\| | |||||
| * | xwininfo libXft mesa git update 29 sep 2011 | marha | 2011-09-29 | 11 | -14/+90 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-09-28 | 7 | -837/+905 |
|\| | |||||
| * | mesa pixman xkeyboard-config git update 28 sep 2011 | marha | 2011-09-28 | 7 | -837/+905 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-09-27 | 12 | -548/+829 |
|\| | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/mesa/main/version.c xorg-server/include/globals.h xorg-server/mi/misprite.c xorg-server/mi/mivaltree.c xorg-server/os/utils.c | ||||
| * | libX11 pixman mesa xserver git update 27 sep 2011 | marha | 2011-09-27 | 12 | -548/+829 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-09-26 | 36 | -567/+693 |
|\| | | | | | | | | | Conflicts: libXmu/src/CmapAlloc.c | ||||
| * | fontconfig libX11 libXext libXft libXmu mesa git update 26 sep 2011 | marha | 2011-09-26 | 36 | -567/+693 |
| | |