Merge branch 'openelec-settings' of github.com:OpenELEC/OpenELEC.tv into openelec-settings

This commit is contained in:
Stephan Raue 2013-02-02 06:58:14 +01:00
commit b1e3019f99

View File

@ -20,21 +20,6 @@
# http://www.gnu.org/copyleft/gpl.html # http://www.gnu.org/copyleft/gpl.html
################################################################################ ################################################################################
. /etc/profile if [ -f /storage/.cache/xkb/layout ] ; then
. /var/config/settings.conf cat /storage/.cache/xkb/layout
if [ -z $X11_KEYMAP ]; then
X11_KEYMAP="us"
fi fi
if [ ! "$X11_KEYMAP2" == "-none-" ]; then
XKBLAYOUT="$X11_KEYMAP,$X11_KEYMAP2"
XKBOPTIONS="grp:alt_shift_toggle"
else
XKBLAYOUT="$X11_KEYMAP"
fi
echo "XKBMODEL=\"pc105\""
echo "XKBVARIANT=\"\""
echo "XKBLAYOUT=\"$XKBLAYOUT\""
echo "XKBOPTIONS=\"$XKBOPTIONS\""