diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:38:52 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:38:52 +0000 |
| commit | ab82c8b039178c5946407d796d458fcadd0e1a37 (patch) | |
| tree | af843d4d3fe4414c5a60690200d9fba9dbf229d4 /XKBsrv.h | |
| parent | 5c4753f11a817e968bff5a85942ff47d38562c20 (diff) | |
23. Merged with XFree86 4.4.0. Added changes that went into infected files.before_20040421_xprint_branch_landingXORG-CURRENT-premerge-release-1XORG-CURRENT-CLOSEDXACE-SELINUX-BASEDAMAGE-XFIXES-BASEXORG-CURRENTXACE-SELINUXDAMAGE-XFIXES
Reverted darwin/bundle/**/Credits.rtf to XFree86 versions to avoid
future conflicts on ASCII but not humal readable files. (There should
probably be separate CreditsXorg.rtf files) (Egbert Eich).
Diffstat (limited to 'XKBsrv.h')
| -rw-r--r-- | XKBsrv.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/include/extensions/XKBsrv.h,v 3.23 2003/11/17 22:20:02 dawes Exp $ */ +/* $XFree86: xc/include/extensions/XKBsrv.h,v 3.22 2002/11/20 04:49:01 dawes Exp $ */ #ifndef _XKBSRV_H_ #define _XKBSRV_H_ |