Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/released' | marha | 2012-07-11 | 1 | -1/+1 |
|\ | | | | | | | | | | | | | | | | | | | | | Conflicts: xorg-server/Xext/shm.c xorg-server/Xext/sync.c xorg-server/Xext/xf86bigfont.c xorg-server/Xi/opendev.c xorg-server/dix/dispatch.c xorg-server/include/globals.h xorg-server/mi/miinitext.c | ||||
| * | fontconfig mesa xserver git update 10 Jul 2012 | marha | 2012-07-10 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-22 | 1 | -3/+13 |
|\| | | | | | | | | | Conflicts: mesalib/src/mapi/glapi/gen/.gitignore | ||||
| * | mesa xserver libxcb fontconfig | marha | 2012-06-22 | 1 | -3/+13 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-18 | 1 | -2/+12 |
|\| | |||||
| * | fontconfig mesa pixman git update 18 Jun 2012 | marha | 2012-06-18 | 1 | -2/+12 |
| | | |||||
* | | Solved compilation error in fontconfig | marha | 2012-06-15 | 1 | -3/+0 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-15 | 7 | -34/+41 |
|\| | | | | | | | | | | | | | | | Conflicts: fontconfig/src/fcint.h fontconfig/src/fcstat.c mesalib/src/mapi/glapi/gen/GL3x.xml xorg-server/glx/glxext.h | ||||
| * | fontconfig mesa pixman xserver git update 15 juni 2012 | marha | 2012-06-15 | 7 | -34/+43 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-12 | 4 | -6/+7 |
|\| | |||||
| * | fontconfig mesa pixman git update 12 Juni 2012 | marha | 2012-06-12 | 4 | -9/+10 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-11 | 6 | -74/+273 |
|\| | | | | | | | | | Conflicts: mesalib/src/glsl/glcpp/.gitignore | ||||
| * | fontconfig glproto mesa pixman git update 11 Jun 2012 | marha | 2012-06-11 | 6 | -74/+273 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-04 | 6 | -19/+70 |
|\| | |||||
| * | fontconfig libX11 libXft mesa pixman xserver xkeyboard-config git update 4 | marha | 2012-06-04 | 6 | -19/+70 |
| | | | | | | | | May 2012 | ||||
* | | fontconfig: solved compile warnings and link errors. | marha | 2012-05-29 | 3 | -2/+4 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-05-29 | 6 | -150/+349 |
|\| | | | | | | | | | | | Conflicts: pixman/pixman/pixman-mmx.c xorg-server/Xext/hashtable.c | ||||
| * | fontconfig libX11 mesa pixman xserver git update 29 May 2012 | marha | 2012-05-29 | 6 | -150/+349 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-05-25 | 1 | -0/+5 |
|\| | |||||
| * | fontconfig xserver xkeyboard-config pixman git update 2012 | marha | 2012-05-25 | 1 | -0/+5 |
| | | |||||
* | | Solved compilation errors | marha | 2012-05-25 | 1 | -3/+6 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-05-21 | 5 | -129/+329 |
|\| | |||||
| * | fontconfig mesa xkeyboard-config xserver pixman git update 21 Mar 2012 | marha | 2012-05-21 | 5 | -129/+329 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-05-15 | 5 | -27/+69 |
|\| | |||||
| * | fontconfig libX11 mesa xkeyboard-config pixman git update 14 May 2012 | marha | 2012-05-14 | 5 | -27/+69 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-05-10 | 1 | -2/+0 |
|\| | | | | | | | | | Conflicts: xorg-server/os/log.c | ||||
| * | xserver fontconfig mesa git update 10 May 2012 | marha | 2012-05-10 | 1 | -2/+0 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-05-02 | 4 | -26/+67 |
|\| | | | | | | | | | Conflicts: xorg-server/os/connection.c | ||||
| * | fontconfig mesa xserver xkeyboard-config git update 2 May 2012 | marha | 2012-05-02 | 4 | -26/+67 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-04-30 | 6 | -29/+249 |
|\| | | | | | | | | | | | Conflicts: pixman/pixman/pixman-mmx.c xorg-server/glx/glapi_gentable.c | ||||
| * | fontconfig libX11 libfontenc mesa pixman xserver git update 30 Apr 2012 | marha | 2012-04-30 | 6 | -29/+249 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-04-23 | 4 | -2/+90 |
|\| | |||||
| * | fontconfig libXau libXext libxcb pixman mesa git update 23 April 2012 | marha | 2012-04-23 | 4 | -2/+90 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-04-20 | 2 | -0/+93 |
|\| | | | | | | | | | | | Conflicts: xorg-server/dix/dispatch.c xorg-server/dix/resource.c | ||||
| * | fontconfig libX11 mesa pixman xserver git update 20 april 2012 | marha | 2012-04-20 | 2 | -0/+93 |
| | | |||||
* | | solved compiler warning | marha | 2012-04-20 | 1 | -0/+2 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-04-17 | 1 | -0/+3 |
|\| | |||||
| * | fontconfig mesa git update 17 Apr 2012 | marha | 2012-04-17 | 1 | -0/+3 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-04-13 | 5 | -39/+164 |
|\| | |||||
| * | fontconfig xserver xkeyboard-config mesa git update 13 Apr 2012 | marha | 2012-04-13 | 6 | -46/+164 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-04-10 | 2 | -7/+22 |
|\| | | | | | | | | | Conflicts: xorg-server/os/log.c | ||||
| * | fontconfig mesa xkeyboard-config xserver pixman git update 10 Apr 2012 | marha | 2012-04-10 | 2 | -7/+22 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-03-30 | 1 | -1/+1 |
|\| | |||||
| * | fontconfig git update 30 mar 2012 | marha | 2012-03-30 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-03-29 | 1 | -13/+0 |
|\| | |||||
| * | xserver fontconfig mesa git update 29 Mar 2012 | marha | 2012-03-29 | 1 | -13/+0 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-03-28 | 7 | -78/+55 |
|\| | |||||
| * | xkeyboard-config pixman fontconfig mesa git update 28 Mar 2012 | marha | 2012-03-28 | 7 | -78/+55 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-03-28 | 1 | -0/+3 |
|\| | |||||
| * | fontconfig libxcb xcb-proto mesa xserver git update 27 Mar 2012 | marha | 2012-03-27 | 1 | -0/+3 |
| | |