Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/released' | marha | 2013-02-05 | 1 | -12/+12 |
|\ | | | | | | | | | * origin/released: fontconfig mesa xkeyboard-config git update 5 feb 2013 | ||||
| * | fontconfig mesa xkeyboard-config git update 5 feb 2013 | marha | 2013-02-05 | 1 | -12/+12 |
| | | | | | | | | | | | | xkeyboard-config commit b4be67b48fb11989f1824dd0b1c8c399430162b0 fontconfig commit 95af7447dba7c54ed162b667c0bb2ea6500e8f32 mesa commit 86536a321d9d26137587affe687a07da71f0b526 | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2013-01-28 | 1 | -77/+178 |
|\| | | | | | | | | | * origin/released: mesa mkfontscale pixman git update 28 jan 2013 | ||||
| * | mesa mkfontscale pixman git update 28 jan 2013 | marha | 2013-01-28 | 1 | -77/+178 |
| | | | | | | | | | | | | mesa: 87592cff57feef29565150b9203e220b50623f30 mkfontscale: b3af8de8d25128f565c2ed2f7c63b6e4099eb84e pixman: 65fc1adb6545737058e938105ae948a3607c277c | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2013-01-22 | 1 | -5/+2 |
|\| | | | | | | | | | | | | | | | | | | | | | * origin/released: fontconfig libfontenc mesa mkfontscale pixman xserver xkeyboard-config Conflicts: mesalib/src/mesa/main/syncobj.c mesalib/src/mesa/main/syncobj.h xorg-server/hw/xwin/winconfig.c xorg-server/hw/xwin/winmultiwindowwndproc.c | ||||
| * | fontconfig libfontenc mesa mkfontscale pixman xserver xkeyboard-config | marha | 2013-01-22 | 1 | -5/+2 |
| | | | | | | | | | | | | | | | | | | | | fontconfig: 000ca9ccb03013a5b151f0d21148ab0ca4c2f2de libfontenc: f5d1208172e965fdd7fae8927bd3e29b3cc3a975 mesa: 148fc6d53716f39971a453792570c2b8c207efb6 mkfontscale: 547517571e695728278a264eedbac47b6e1f43bc pixman: 2c6577476e5b18e17904ae8af244a39c352e2e33 xserver: 70b127c9f1c53bdb42f078265e67f76b464deae2 xkeyboard-config: 6b35b1b43d2fdff30f530d7cf65fffd6c3504690 | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-09-14 | 1 | -1/+4 |
|\| | |||||
| * | fontconfig libX11 mesa xkeyboard-config git update 14 sep 2012 | marha | 2012-09-14 | 1 | -1/+4 |
| | | |||||
| * | xwininfo fontconfig libX11 libXau libXext libxcb mesa pixman | marha | 2012-08-27 | 1 | -1/+1 |
| | | | | | | | | xkeyboard-config git update 27 Aug 2012 | ||||
* | | xwininfo fontconfig libX11 libXau libXext libxcb mesa pixman | marha | 2012-09-04 | 1 | -1/+1 |
| | | | | | | | | xkeyboard-config git update 27 Aug 2012 | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-08-13 | 1 | -4/+26 |
|\| | |||||
| * | mesa pixman xkeyboard-config xserver git update 13 Aug 2012 | marha | 2012-08-13 | 1 | -4/+26 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-08-01 | 1 | -4/+15 |
|\| | |||||
| * | git mesa update 1 Aug 2012 | marha | 2012-08-01 | 1 | -4/+15 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-07-31 | 1 | -1/+176 |
|\| | |||||
| * | fontconfig libXext mesa xserver pixman git update 31 Jul 2012 | marha | 2012-07-31 | 1 | -1/+176 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-05-25 | 1 | -3/+12 |
|\| | |||||
| * | fontconfig xserver xkeyboard-config pixman git update 2012 | marha | 2012-05-25 | 1 | -3/+12 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-04-10 | 1 | -2/+1 |
|\| | | | | | | | | | Conflicts: xorg-server/os/log.c | ||||
| * | fontconfig mesa xkeyboard-config xserver pixman git update 10 Apr 2012 | marha | 2012-04-10 | 1 | -2/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-02-29 | 1 | -8/+7 |
|\| | |||||
| * | xserver fontconfig mesa pixman git update 29 Feb 2012 | marha | 2012-02-29 | 1 | -8/+7 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-01-20 | 1 | -1/+1 |
|\| | |||||
| * | xserver xkeyboard-config git update 20 jan 2012 | marha | 2012-01-20 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-01-13 | 1 | -2/+58 |
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libxcb/src/xcb_auth.c libxcb/src/xcb_conn.c libxcb/src/xcb_out.c libxcb/src/xcb_util.c xorg-server/dix/dispatch.c xorg-server/include/dixstruct.h xorg-server/include/misc.h xorg-server/os/connection.c | ||||
| * | libxtrans libXdmcp libxcb mesa xserver git update 13 jan 2012 | marha | 2012-01-13 | 1 | -2/+58 |
| | | |||||
| * | libX11 mesa pixman git update 6 jan 2012 | marha | 2012-01-06 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-25 | 1 | -5/+5 |
|\| | | | | | | | | | | | | | | | | | | | 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 | 1 | -5/+5 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-17 | 1 | -2/+44 |
|\| | | | | | | | | | Conflicts: mesalib/src/mesa/swrast/s_readpix.c | ||||
| * | xserver mesa git update 17 nov 2011 | marha | 2011-11-17 | 1 | -2/+44 |
| | | |||||
* | | Solved compile problem in debug | marha | 2011-11-10 | 1 | -2/+1 |
|/ | |||||
* | libX11 mesa pixman git update 9 nov 2011 | marha | 2011-11-09 | 1 | -0/+249 |
| | |||||
* | libX11 libXft mesa mkfontscale pixman xserver git update 26 okt 2011 | marha | 2011-10-26 | 1 | -0/+85 |