summaryrefslogtreecommitdiff
path: root/po/fr.po
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2007-10-10 18:12:29 -0400
committerJoey Hess <joey@kodama.kitenet.net>2007-10-10 18:12:29 -0400
commitcbfe27aa5478a1fb739af98ce5c6418698279a3a (patch)
tree99de2f40efd9ab2bbc10682e3ad946368d9dbd96 /po/fr.po
parentb2b2ea118411fd5cc5ba27bb50091defbc927dad (diff)
parentd72e5312894dddf9ab6112408555819a7e2ab2e9 (diff)
downloaddpkg-cbfe27aa5478a1fb739af98ce5c6418698279a3a.tar.gz
Merge branch 'master' of git://git.debian.org/git/dpkg/dpkg into sourcev3
Conflicts: man/dpkg-source.1 scripts/Makefile.am (manually resolved)
Diffstat (limited to 'po/fr.po')
0 files changed, 0 insertions, 0 deletions