← Back to branch summary

~snappy-dev/goget-ubuntu-touch/all-snaps

~snappy-dev/goget-ubuntu-touch/all-snaps

Viewing all changes in revision 251.

Committer: Michael Vogt
Date: 2016-01-19 09:38:05 UTC
mfrom: (214.2.7 goget-ubuntu-touch)
Revision ID: michael.vogt@ubuntu.com-20160119093805-um9zx82i43omlv8t

merged lp:goget-ubuntu-touch and resolved conflicts

files modified:
diskimage/bootloader.go

diskimage/common.go

diskimage/core_grub.go

diskimage/core_uboot.go

ubuntu-device-flash/channel_maps.go

ubuntu-device-flash/snappy.go

Show diffs side-by-side

added added

removed removed

diskimage/bootloader.go

diskimage/common.go

diskimage/core_grub.go

diskimage/core_uboot.go

ubuntu-device-flash/channel_maps.go

ubuntu-device-flash/snappy.go