Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Synchronised line endinge with release branch | marha | 2011-09-12 | 2 | -116/+116 |
| | |||||
* | Merge remote-tracking branch 'origin/released' | marha | 2011-06-13 | 1 | -1/+1 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: X11/extensions/configure.ac X11/xtrans/configure.ac X11/xtrans/doc/Makefile.am libX11/configure.ac libX11/docbook.am libXdmcp/configure.ac libXdmcp/doc/Makefile.am libXext/configure.ac libXext/docbook.am libXmu/configure.ac libXmu/doc/Makefile.am mesalib/src/mapi/glapi/gen/Makefile mesalib/src/mapi/glapi/glapi.h mesalib/src/mesa/state_tracker/st_draw.c xorg-server/xkeyboard-config/rules/base.extras.xml.in xorg-server/xkeyboard-config/rules/compat/variantsMapping.lst xorg-server/xkeyboard-config/symbols/de | ||||
| * | libX11 mesa xkeyboard-config libXmu libXext libXdmcp libxtrans x11proto git ↵ | marha | 2011-06-13 | 1 | -1/+1 |
| | | | | | | | | update 13 Jun 2011 | ||||
* | | Added gitignore files | marha | 2011-05-30 | 1 | -0/+16 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-14 | 1 | -50/+49 |
|\| | |||||
| * | server xkeyboard-config mesa git update 14 Apr 2011 | marha | 2011-04-14 | 1 | -1/+0 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-02-21 | 2 | -70/+69 |
|\| | |||||
| * | xserver xkeyboard-config mesa git update 21 Feb 2011 | marha | 2011-02-21 | 1 | -2/+1 |
| | | |||||
| * | Renamed xkbdata.src to xkeyboard-config (to reflect the name in the git ↵ | marha | 2010-07-13 | 10 | -0/+153 |
| | | | | repository) | ||||
* | Renamed xkbdata.src also on trunk since the current merging of subversion ↵ | marha | 2010-07-13 | 11 | -0/+206 |
will loose all the changes in xkbdata.src when the directory is renamed on the source branch. |