Module Name: xsrc
Committed By: ghen
Date: Fri May 28 10:01:08 UTC 2010
Modified Files:
xsrc/external/mit/xkeyboard-config/dist/symbols: Makefile.am
symbols.dir
Added Files:
xsrc/external/mit/xkeyboard-config/dist/rules: base.lo_s.part
base.o_k.part
Removed Files:
xsrc/external/mit/xkeyboard-config/dist/po: s...@latn.po
xsrc/external/mit/xkeyboard-config/dist/rules: base base.l2_s.part
base.l3_s.part base.l4_s.part base.lst evdev evdev.lst
xsrc/external/mit/xkeyboard-config/dist/rules/compat: layoutRename.lst
ln_s.sh lnv_s.sh ml1_s.sh ml1v1_s.sh ml1v_s.sh ml_s.sh mlv_s.sh
variantRename.lst
xsrc/external/mit/xkeyboard-config/dist/symbols: braille
xsrc/external/mit/xkeyboard-config/dist/symbols/macintosh_vndr: es
xsrc/external/mit/xkeyboard-config/dist/symbols/sun_vndr: cs hu ko sw
usb
Log Message:
Resolve conflicts.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/xkeyboard-config/dist/po/s...@latn.po
cvs rdiff -u -r1.4 -r0 xsrc/external/mit/xkeyboard-config/dist/rules/base
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/xkeyboard-config/dist/rules/base.l2_s.part \
xsrc/external/mit/xkeyboard-config/dist/rules/base.l3_s.part \
xsrc/external/mit/xkeyboard-config/dist/rules/base.l4_s.part \
xsrc/external/mit/xkeyboard-config/dist/rules/evdev \
xsrc/external/mit/xkeyboard-config/dist/rules/evdev.lst
cvs rdiff -u -r0 -r1.3 \
xsrc/external/mit/xkeyboard-config/dist/rules/base.lo_s.part \
xsrc/external/mit/xkeyboard-config/dist/rules/base.o_k.part
cvs rdiff -u -r1.1.1.2 -r0 \
xsrc/external/mit/xkeyboard-config/dist/rules/base.lst
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/xkeyboard-config/dist/rules/compat/layoutRename.lst
cvs rdiff -u -r1.1.1.2 -r0 \
xsrc/external/mit/xkeyboard-config/dist/rules/compat/ln_s.sh \
xsrc/external/mit/xkeyboard-config/dist/rules/compat/lnv_s.sh \
xsrc/external/mit/xkeyboard-config/dist/rules/compat/ml1_s.sh \
xsrc/external/mit/xkeyboard-config/dist/rules/compat/ml1v1_s.sh \
xsrc/external/mit/xkeyboard-config/dist/rules/compat/ml1v_s.sh \
xsrc/external/mit/xkeyboard-config/dist/rules/compat/ml_s.sh \
xsrc/external/mit/xkeyboard-config/dist/rules/compat/mlv_s.sh \
xsrc/external/mit/xkeyboard-config/dist/rules/compat/variantRename.lst
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am
cvs rdiff -u -r1.1.1.2 -r0 \
xsrc/external/mit/xkeyboard-config/dist/symbols/braille
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xkeyboard-config/dist/symbols/symbols.dir
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/xkeyboard-config/dist/symbols/macintosh_vndr/es
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/xkeyboard-config/dist/symbols/sun_vndr/cs \
xsrc/external/mit/xkeyboard-config/dist/symbols/sun_vndr/hu \
xsrc/external/mit/xkeyboard-config/dist/symbols/sun_vndr/ko \
xsrc/external/mit/xkeyboard-config/dist/symbols/sun_vndr/sw \
xsrc/external/mit/xkeyboard-config/dist/symbols/sun_vndr/usb
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
