Merge branch 'debian/jessie' into ubuntu/master
Conflicts: configure.ac debian/changelog
Showing
- apt-pkg/deb/deblistparser.cc 1 addition, 1 deletionapt-pkg/deb/deblistparser.cc
- apt-pkg/pkgcache.cc 1 addition, 13 deletionsapt-pkg/pkgcache.cc
- apt-pkg/pkgcache.h 1 addition, 1 deletionapt-pkg/pkgcache.h
- configure.ac 1 addition, 1 deletionconfigure.ac
- debian/changelog 35 additions, 0 deletionsdebian/changelog
- doc/apt-verbatim.ent 1 addition, 1 deletiondoc/apt-verbatim.ent
- doc/po/apt-doc.pot 2 additions, 2 deletionsdoc/po/apt-doc.pot
- po/apt-all.pot 492 additions, 492 deletionspo/apt-all.pot
- po/ar.po 493 additions, 493 deletionspo/ar.po
- po/ast.po 519 additions, 519 deletionspo/ast.po
- po/bg.po 521 additions, 521 deletionspo/bg.po
- po/bs.po 506 additions, 506 deletionspo/bs.po
- po/ca.po 496 additions, 496 deletionspo/ca.po
- po/cs.po 519 additions, 519 deletionspo/cs.po
- po/cy.po 507 additions, 507 deletionspo/cy.po
- po/da.po 517 additions, 517 deletionspo/da.po
- po/de.po 497 additions, 497 deletionspo/de.po
- po/dz.po 516 additions, 516 deletionspo/dz.po
- po/el.po 494 additions, 494 deletionspo/el.po
- po/es.po 516 additions, 516 deletionspo/es.po
Loading
Please register or sign in to comment