Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/released' | marha | 2014-01-15 | 1 | -7/+7 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/released: mesa xkeyboard-config xserver git update 15 jan 2014 randrproto libfontenc mesa xserver git update 10 Jan 2014 randsrproto fontconfig libX11 git update 6 Jan 2014 Conflicts: mesalib/src/glsl/builtin_functions.cpp mesalib/src/glsl/ir_builder.h xorg-server/Xext/xres.c xorg-server/dix/dispatch.c xorg-server/dix/dixfonts.c xorg-server/hw/xwin/wingc.c xorg-server/hw/xwin/winwindowswm.c xorg-server/include/gc.h xorg-server/os/access.c | ||||
| * | mesa xkeyboard-config xserver git update 15 jan 2014 | marha | 2014-01-15 | 1 | -7/+7 |
| | | | | | | | | | | | | xserver commit 2d2d49dab5c5718989de97d7227aac793479745e xkeyboard-config commit 78af7aa79c6552924295644b911e45d07a0fcdad mesa commit a05c596a00916ce6a9c9d35ff36cd1e401fddd43 | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-05-29 | 1 | -0/+1 |
|\| | | | | | | | | | | | 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 | 1 | -0/+4 |
| | | |||||
* | | Solved compilation errors and warnings due to latest commit | marha | 2012-04-20 | 1 | -6/+9 |
|/ | |||||
* | fontconfig libX11 mesa pixman xserver git update 20 april 2012 | marha | 2012-04-20 | 1 | -0/+291 |