projects / debian / cpmtools / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d5eb355 da79766)
Merge commit 'upstream/2.10'
authorBdale Garbee <bdale@gag.com>
Tue, 8 Sep 2009 18:32:59 +0000 (12:32 -0600)
committerBdale Garbee <bdale@gag.com>
Tue, 8 Sep 2009 18:32:59 +0000 (12:32 -0600)
Conflicts:
Makefile.in
config.guess
config.sub

1  2 
fsck.cpm.1.in patch | diff1 | diff2 | blob | history
fsed.cpm.1.in patch | diff1 | diff2 | blob | history

diff --cc fsck.cpm.1.in
Simple merge
diff --cc fsed.cpm.1.in
Simple merge
Debian packaging of cpmtools