Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/released' | marha | 2011-10-19 | 1 | -141/+141 |
|\ | | | | | | | | | Conflicts: xorg-server/include/os.h | ||||
| * | libX11 libXext libXft mesa libxcb mkfontscale pixman xserver | marha | 2011-10-19 | 1 | -141/+141 |
| | | | | | | | | xkeyboard-config git update 19 oct 2011 | ||||
* | | svn merge ^/branches/released . | marha | 2011-02-20 | 14 | -877/+849 |
|\| | |||||
| * | xserver xkeyboard-config libX11 pixman mesa git update 2011 | marha | 2011-02-20 | 14 | -877/+849 |
| | | |||||
| * | Renamed xkbdata.src to xkeyboard-config (to reflect the name in the git ↵ | marha | 2010-07-13 | 17 | -0/+1171 |
| | | | | repository) | ||||
* | Renamed xkbdata.src also on trunk since the current merging of subversion ↵ | marha | 2010-07-13 | 18 | -0/+1187 |
will loose all the changes in xkbdata.src when the directory is renamed on the source branch. |