summaryrefslogtreecommitdiff
path: root/rsync/msg.c
authorwaspe <waspe>2003-11-03 18:37:25 (UTC)
committer waspe <waspe>2003-11-03 18:37:25 (UTC)
commitfd87de118d519108b99125f190f3aa6bd2a0b4cb (patch) (unidiff)
treef71229f0ba9cba7ece5c9c2b306fb8c39e75df67 /rsync/msg.c
parentc0fe2d62abe68de74de6b8bf91635c1cdaf5d239 (diff)
downloadopie-fd87de118d519108b99125f190f3aa6bd2a0b4cb.zip
opie-fd87de118d519108b99125f190f3aa6bd2a0b4cb.tar.gz
opie-fd87de118d519108b99125f190f3aa6bd2a0b4cb.tar.bz2
resolve merge conflict
Diffstat (limited to 'rsync/msg.c') (more/less context) (ignore whitespace changes)
0 files changed, 0 insertions, 0 deletions