Merge branch 'glued-1.8.x'

Conflicts:
	mkconfig.bash
	systems/lctr-a6xx/lauv-dolphin-1.cfg
This commit is contained in:
Ricardo Martins 2013-08-19 21:11:12 +01:00
commit 8c1168dd62

View File

@ -2,5 +2,4 @@ cfg_hostname='lauv-dolphin-1'
cfg_eth_ext_ip='10.0.10.80'
cfg_packages="$cfg_packages"
cfg_escc_script='/etc/escc/ifog-imu-1-a.sh'
cfg_arp_table='192.168.0.5|00:1F:F2:06:E3:61'
cfg_dune_i18n='ru_RU'
cfg_dune_i18n='C'