diff options
author | Wookey <wookey@wookware.org> | 2013-08-22 18:38:40 +0100 |
---|---|---|
committer | Wookey <wookey@wookware.org> | 2013-08-22 18:38:40 +0100 |
commit | ffa2fd59aa886f5672432e32db9781ee9cc732b6 (patch) | |
tree | 3a46b6ab0b9b6c7c53772172a3d3424d4877c57a /raring-armhf-nano-lava/customization/includes.chroot/etc/hostname | |
parent | aee0d543556dd48d731851c5be68bbf783bb68c1 (diff) | |
parent | bec3b29af6db7c091535e8427b2d7c73bc30a632 (diff) |
Merge branch 'master' into newreponewrepo
Use the new repo.l.o repository, but include main/debug suite.
Conflicts:
raring-armhf-alip/customization/archives/linaro-overlay-ppa.list.chroot
raring-armhf-developer/customization/archives/linaro-overlay-ppa.list.chroot
raring-armhf-nano-lava/customization/archives/linaro-overlay-ppa.list.chroot
raring-armhf-server/customization/archives/linaro-overlay-ppa.list.chroot
raring-armhf-ubuntu-desktop/customization/archives/linaro-overlay-ppa.list.chroot
Diffstat (limited to 'raring-armhf-nano-lava/customization/includes.chroot/etc/hostname')
-rw-r--r-- | raring-armhf-nano-lava/customization/includes.chroot/etc/hostname | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/raring-armhf-nano-lava/customization/includes.chroot/etc/hostname b/raring-armhf-nano-lava/customization/includes.chroot/etc/hostname new file mode 100644 index 0000000..1d1dfdb --- /dev/null +++ b/raring-armhf-nano-lava/customization/includes.chroot/etc/hostname @@ -0,0 +1 @@ +linaro-nano |