← Back to branch summary

~peter-pearse/ubuntu/natty/libx11/prop001

« back to all changes in this revision

Viewing changes to src/xkb/XKBCvt.c

  • Committer: Bazaar Package Importer
  • Author(s): Colin Watson
  • Date: 2010-05-13 14:10:02 UTC
  • mfrom: (1.1.11 upstream) (2.1.7 sid)
  • Revision ID: james.westby@ubuntu.com-20100513141002-iwty88l2nzmc0nt3
Tags: 2:1.3.3-3ubuntu1
* Resynchronise with Debian.  Remaining changes:
  - Add Latin locale.
  - Add Klingon locale.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/xkb/XKBCvt.c
1
 
/* $Xorg: XKBCvt.c,v 1.5 2001/02/09 02:03:38 xorgcvs Exp $ */
2
1
/*
3
2
 
4
3
Copyright 1988, 1989, 1998  The Open Group
26
25
from The Open Group.
27
26
 
28
27
*/
29
 
/* $XFree86: xc/lib/X11/XKBCvt.c,v 3.34 2002/10/08 23:31:35 dawes Exp $ */
30
28
 
31
29
#ifdef HAVE_CONFIG_H
32
30
#include <config.h>