← Back to branch summary

~ubuntu-branches/ubuntu/trusty/schroot/trusty

Viewing all changes in revision 29.

  • Committer: Bazaar Package Importer
  • Author(s): Kees Cook
  • Date: 2010-06-09 16:01:50 UTC
  • mfrom: (1.1.22 upstream) (2.2.4 sid)
  • Revision ID: james.westby@ubuntu.com-20100609160150-z46e8nxjxo7ed9jf
Tags: 1.4.2-1ubuntu1
* Merge from debian unstable.  Remaining changes:
  - debian/rules: don't build the docs on armel, fixes FTBFS.
* debian/rules: allow for parallel builds.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: