Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/released' | marha | 2011-10-19 | 2 | -254/+228 |
|\ | | | | | | | | | Conflicts: xorg-server/include/os.h | ||||
| * | libX11 libXext libXft mesa libxcb mkfontscale pixman xserver | marha | 2011-10-19 | 2 | -254/+228 |
| | | | | | | | | xkeyboard-config git update 19 oct 2011 | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-06-16 | 1 | -108/+115 |
|\| | | | | | | | | | | | | | | | Conflicts: xorg-server/glx/glapi.h xorg-server/hw/xquartz/GL/indirect.c xorg-server/hw/xquartz/X11Application.m xorg-server/xkeyboard-config/symbols/jp | ||||
| * | xserver xkeyboard-config xkbcomp git update 16 June 2011 | marha | 2011-06-16 | 1 | -108/+115 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-02-20 | 11 | -851/+820 |
|\| | |||||
| * | xserver xkeyboard-config libX11 pixman mesa git update 2011 | marha | 2011-02-20 | 11 | -860/+829 |
| | | |||||
| * | Renamed xkbdata.src to xkeyboard-config (to reflect the name in the git ↵ | marha | 2010-07-13 | 14 | -0/+889 |
| | | | | repository) | ||||
* | Renamed xkbdata.src also on trunk since the current merging of subversion ↵ | marha | 2010-07-13 | 15 | -0/+906 |
will loose all the changes in xkbdata.src when the directory is renamed on the source branch. |