livecd-rootfs/.bzr/checkout/merge-hashes
Oliver Grawert a0831846ee Import patches-unapplied version 0.92 to ubuntu/karmic
Imported using git-ubuntu import.

Changelog parent: 96da636da0810a1f65d850bf5178aca3e6e32535

New changelog entries:
  * change armel+imx51 back to the proper metapackage name
  * enable universe for armel+dove build
  * drop armel fallback, we want to fail officially if no armel subarch is set
  * clean some trailing whitespace in the armel subarch case statement
2009-08-21 18:04:30 +00:00

7 lines
300 B
Plaintext

BZR merge-modified list format 1
file_id: x_LaMont_Jones_<lamont.jones@canonical.com>_Thu_Jan__6_23:41:24_2005_11810.1
hash: 64a8ca3d9f969fe6ccff917739be2dbaf85af2d3
file_id: x_LaMont_Jones_<lamont.jones@canonical.com>_Thu_Jan__6_23:41:24_2005_11810.5
hash: 723d11f776ba3507bac97fd386d7ffaa8a43de7c