Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | 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 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-09-29 | 13 | -18/+98 | |
|\| | ||||||
| * | xwininfo libXft mesa git update 29 sep 2011 | marha | 2011-09-29 | 13 | -18/+98 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-09-28 | 8 | -837/+909 | |
|\| | ||||||
| * | mesa pixman xkeyboard-config git update 28 sep 2011 | marha | 2011-09-28 | 8 | -837/+909 | |
| | | ||||||
* | | Added lower_clip_distance.cpp to project file | marha | 2011-09-27 | 5 | -304/+8 | |
| | | ||||||
* | | 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 | 37 | -567/+702 | |
|\| | | | | | | | | | Conflicts: libXmu/src/CmapAlloc.c | |||||
| * | fontconfig libX11 libXext libXft libXmu mesa git update 26 sep 2011 | marha | 2011-09-26 | 37 | -567/+702 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-09-22 | 49 | -5722/+5999 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: xorg-server/Xext/dpms.c xorg-server/Xext/saver.c xorg-server/Xext/security.c xorg-server/Xext/shape.c xorg-server/Xext/sync.c xorg-server/Xi/opendev.c xorg-server/fb/wfbrename.h xorg-server/glx/glxserver.h xorg-server/hw/xwin/winwindowswm.c xorg-server/mi/miarc.c xorg-server/mi/miwideline.c xorg-server/os/io.c xorg-server/render/mipict.c | |||||
| * | libxtrans libX11 libX11 libXext mesa xserver git update 22 sep 2011 | marha | 2011-09-22 | 49 | -5722/+5999 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-09-21 | 1 | -0/+119 | |
|\| | ||||||
| * | libxtrans libX11 libXext mesa git update 21 sep 2011 | marha | 2011-09-21 | 1 | -0/+119 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-09-20 | 92 | -4908/+3668 | |
|\| | ||||||
| * | libX11 libxtrans mesa git update 20 sep 2011 | marha | 2011-09-20 | 92 | -4908/+3668 | |
| | | ||||||
* | | texfetch.* -> s_texfetch.* | marha | 2011-09-19 | 4 | -4/+4 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-09-19 | 37 | -2916/+3051 | |
|\| | | | | | | | | | Conflicts: libfontenc/src/fontenc.c | |||||
| * | xtrans libX11 libXext libXdmcp libXau libXft libXinerama libXmu libfontenc | marha | 2011-09-19 | 37 | -2916/+3051 | |
| | | | | | | | | mesa git update 19 sept 2011 | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-09-16 | 5 | -6/+131 | |
|\| | ||||||
| * | git update libXext libXdmcp mesa xkeyboard-config 16 sep 2011 | marha | 2011-09-16 | 5 | -6/+131 | |
| | | | | | | | | X11/extensions: removed files that are in multiple extension modules | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-09-15 | 26 | -3080/+2006 | |
|\| | ||||||
| * | libxtrans libXmu libXext mesa pixman git update 15 sept 2011 | marha | 2011-09-15 | 26 | -3080/+2006 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-09-14 | 5 | -10/+34 | |
|\| | ||||||
| * | mesa git update 14 sep 2011 | marha | 2011-09-14 | 5 | -10/+34 | |
| | | ||||||
* | | Synchronised line endinge with release branch | marha | 2011-09-12 | 209 | -251821/+251821 | |
| | |