head	1.2;
access;
symbols
	riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.2
	riastradh-drm2-base:1.2
	xkeyboard-config-2-1:1.1.1.4
	xkeyboard-config-2-0:1.1.1.4
	xkeyboard-config-1-9:1.1.1.3
	xorg:1.1.1;
locks; strict;
comment	@# @;


1.2
date	2011.07.23.11.21.56;	author mrg;	state dead;
branches;
next	1.1;

1.1
date	2010.05.28.09.54.29;	author ghen;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	2010.05.28.09.54.29;	author ghen;	state Exp;
branches;
next	1.1.1.2;

1.1.1.2
date	2010.11.22.00.27.24;	author mrg;	state Exp;
branches;
next	1.1.1.3;

1.1.1.3
date	2010.11.28.04.48.57;	author mrg;	state Exp;
branches;
next	1.1.1.4;

1.1.1.4
date	2010.11.28.07.50.30;	author mrg;	state Exp;
branches;
next	;


desc
@@


1.2
log
@merge xkeyboard-config 2.3
@
text
@rs	combiningkeys	extras/rs	combiningkeys
us	alt-intl-unicode	extras/us	alt-intl-unicode
us	crd		extras/us	crd
us	intl-unicode	extras/us	intl-unicode
@


1.1
log
@Initial revision
@
text
@@


1.1.1.1
log
@Initial import of xkeyboard-config-1.9
@
text
@@


1.1.1.2
log
@initial import of xkeyboard-config-2.0.

this adds new symbols/at, symbols/extras/ir and symbols/extras/ru, as
well as many fixes for other configs.
@
text
@a1 2
ru	chu		extras/ru	chu
ir	ave		extras/ir	ave
@


1.1.1.3
log
@second import of xkeyboard-config 1.9.  the 2.0 import causes issues
i haven't been able to figure out, so, revert back to what was working.
@
text
@d2 2
@


1.1.1.4
log
@secondary import of xkeyboard-config-2.0
@
text
@a1 2
ru	chu		extras/ru	chu
ir	ave		extras/ir	ave
@