Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/released' | marha | 2012-03-12 | 12 | -1709/+0 |
|\ | | | | | | | | | | | | | | | Conflicts: libX11/src/OpenDis.c libX11/src/xcb_io.c xorg-server/xkeyboard-config/keymap/sun_vndr/all.in xorg-server/xkeyboard-config/semantics/default.in | ||||
| * | xkeyboard-config fontconfig libX11 libXft libxcb mesa git update 12 Mar 2012 | marha | 2012-03-12 | 12 | -1709/+0 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-02-20 | 11 | -637/+611 |
|\| | |||||
| * | xserver xkeyboard-config libX11 pixman mesa git update 2011 | marha | 2011-02-20 | 11 | -1728/+1702 |
| | | |||||
| * | Renamed xkbdata.src to xkeyboard-config (to reflect the name in the git ↵ | marha | 2010-07-13 | 12 | -0/+1735 |
| | | | | repository) | ||||
* | Renamed xkbdata.src also on trunk since the current merging of subversion ↵ | marha | 2010-07-13 | 13 | -0/+1755 |
will loose all the changes in xkbdata.src when the directory is renamed on the source branch. |