~ed.so/duplicity/0.6-dpbx.importfix

Viewing all changes in revision 972.

  • Committer: Michael Terry
  • Date: 2014-05-05 20:42:15 UTC
  • Revision ID: michael.terry@canonical.com-20140505204215-7rs5r1agicvz0ci7
  * Merged in lp:~mterry/duplicity/fix-drop-u1
    - Looks like when the drop-u1 branch got merged, its conflict got resolved
      badly. Here is the right version of backend.py to use (and also drops 
      u1backend.py from POTFILES).
  * Backported from trunk r973

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: