Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-05 | 75 | -8997/+9030 | |
|\| | | | | | | | | | Conflicts: xorg-server/dix/dispatch.c | |||||
| * | xserver xkeyboard-config mesa git update 5 dec 2011 | marha | 2011-12-05 | 75 | -8997/+9030 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-29 | 53 | -1363/+1515 | |
|\| | ||||||
| * | mesa git update 29 nov 2011 | marha | 2011-11-29 | 53 | -1363/+1515 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-28 | 20 | -1273/+1449 | |
|\| | ||||||
| * | mesa git update 28 nov 2011 | marha | 2011-11-28 | 20 | -1273/+1449 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-25 | 27 | -546/+654 | |
|\| | | | | | | | | | | | | | | | | | | | 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 | 27 | -546/+654 | |
| | | ||||||
* | | 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-18 | 3 | -2/+669 | |
|\| | ||||||
| * | xkeyboard-config mesa git update 18 nov 2011 | marha | 2011-11-18 | 3 | -2/+669 | |
| | | ||||||
* | | Removed compiling of deleted file | marha | 2011-11-18 | 2 | -4/+0 | |
| | | ||||||
* | | 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 | |
| | | ||||||
* | | Updated project files | marha | 2011-11-14 | 4 | -8/+8 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-14 | 27 | -1344/+1093 | |
|\| | | | | | | | | | Conflicts: libX11/src/util/makekeys.c | |||||
| * | libX11 libXext libXinerama libXmu libfontenc libxcb mesa pixman git update | marha | 2011-11-14 | 27 | -1344/+1093 | |
| | | | | | | | | 14 nov 2011 | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-10 | 8 | -76/+774 | |
|\| | ||||||
| * | libX11 mesa git update 10 nov 2011 | marha | 2011-11-10 | 8 | -76/+774 | |
| | | ||||||
* | | Solved compile problem in debug | marha | 2011-11-10 | 1 | -2/+1 | |
| | | ||||||
* | | Removed deleted file | marha | 2011-11-09 | 2 | -4/+0 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-09 | 54 | -1600/+2713 | |
|\| | | | | | | | | | Conflicts: mesalib/src/mapi/glapi/glapi.h | |||||
| * | libX11 mesa pixman git update 9 nov 2011 | marha | 2011-11-09 | 54 | -1601/+2713 | |
| | | ||||||
* | | Synchronised files | marha | 2011-11-07 | 8 | -24/+49 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-07 | 23 | -2502/+2358 | |
|\| | | | | | | | | | Conflicts: pixman/pixman/pixman-mmx.c | |||||
| * | xserver pixman mesa git update 7 nov 2011 | marha | 2011-11-07 | 23 | -2502/+2358 | |
| | | ||||||
* | | Solved mesa compile problems | marha | 2011-11-04 | 3 | -1/+5 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-04 | 130 | -15409/+14466 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 130 | -15402/+14459 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-10-28 | 14 | -1194/+1280 | |
|\| | ||||||
| * | mesa git update 28 okt 2011 | marha | 2011-10-28 | 14 | -1194/+1280 | |
| | | ||||||
* | | Added link_uniforms.cpp to mesa project files | marha | 2011-10-27 | 4 | -0/+8 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-10-27 | 70 | -671/+1575 | |
|\| | ||||||
| * | 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 | 67 | -601/+1467 | |
| | | ||||||
* | | Removed useless code | marha | 2011-10-27 | 1 | -2/+0 | |
| | | ||||||
* | | Solved link problems | marha | 2011-10-19 | 3 | -4/+5 | |
| | | ||||||
* | | Added uniform_query.cpp to mesa project | marha | 2011-10-19 | 2 | -0/+4 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-10-19 | 66 | -3867/+3728 | |
|\| | | | | | | | | | Conflicts: xorg-server/include/os.h | |||||
| * | libX11 libXext libXft mesa libxcb mkfontscale pixman xserver | marha | 2011-10-19 | 66 | -3867/+3728 | |
| | | | | | | | | 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 | |||||
* | | Added new files to project | marha | 2011-10-05 | 2 | -0/+8 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-10-05 | 144 | -11125/+11998 | |
|\| | | | | | | | | | | | | | | | | | 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 | 144 | -11125/+11998 | |
| | | | | | | | | 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 | |
| | |