diff options
| author | marha <marha@users.sourceforge.net> | 2013-08-19 09:07:37 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-08-19 09:07:37 +0200 |
| commit | 2d042f719910c5aa1ba9f4a47b21009c729c345e (patch) | |
| tree | 2b20d89d5f1ca342ca6f1d817c18b324adf7086f /xorg-server/xkeyboard-config/tests | |
| parent | c3d3ea464f7f4e53e8fe3e11ecada36cb209ba4d (diff) | |
| parent | 854ec4da20ddff9b830be0a7d5b81d8cb4774132 (diff) | |
| download | vcxsrv-2d042f719910c5aa1ba9f4a47b21009c729c345e.tar.gz vcxsrv-2d042f719910c5aa1ba9f4a47b21009c729c345e.tar.bz2 vcxsrv-2d042f719910c5aa1ba9f4a47b21009c729c345e.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig libX11 libXdmcp libxcb xkeyboard-config mesa pixman xserver git update 19 aug 2013
Conflicts:
fontconfig/src/fccache.c
Diffstat (limited to 'xorg-server/xkeyboard-config/tests')
| -rw-r--r-- | xorg-server/xkeyboard-config/tests/genLists4Comparizon.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/xorg-server/xkeyboard-config/tests/genLists4Comparizon.sh b/xorg-server/xkeyboard-config/tests/genLists4Comparizon.sh index 90981a939..5756d3ff2 100644 --- a/xorg-server/xkeyboard-config/tests/genLists4Comparizon.sh +++ b/xorg-server/xkeyboard-config/tests/genLists4Comparizon.sh @@ -13,7 +13,9 @@ F1b=${F1}base F1e=${F1}extras xsltproc $ROOT/xslt/reg2ll.xsl $ROOT/rules/base.xml > $F1b -xsltproc $ROOT/xslt/reg2ll.xsl $ROOT/rules/base.extras.xml > $F1e +xsltproc $ROOT/xslt/reg2ll.xsl $ROOT/rules/base.extras.xml | \ + grep -v "sun_type" > $F1e + cat $F1b $F1e | sort | uniq > $F1 rm -f $F1e $F1e @@ -39,7 +41,7 @@ for i in $ROOT/symbols/*; do } else { name=$2; - if (variant == "olpc" || variant == "htcdream") + if (variant == "olpc" || variant == "htcdream" || variant == "olpcm" || variant == "classmate") printf "%s:\"%s\"\n", id, name; else printf "%s(%s):\"%s\"\n", id, variant, name; |