~ubuntu-branches/ubuntu/trusty/atlas/trusty

Viewing all changes in revision 25.

  • Committer: Package Import Robot
  • Author(s): Vibhav Pant
  • Date: 2012-11-05 23:27:22 UTC
  • mfrom: (18.1.6 sid)
  • Revision ID: package-import@ubuntu.com-20121105232722-nb4hausvwrdd7o6q
Tags: 3.8.4-9ubuntu1
* Merge from Debian unstable (LP: #1069761). Remaining Changes:
  - debian/rules:
    - Add "-Si cputhrchk 0" back to config flags because some of the
      Ubuntu build servers have throttling enabled (i386 and amd64).
      Fixes FTBFS on those platforms.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: