aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorNicolas Bacca2004-05-09 14:48:59 +0000
committerNicolas Bacca2004-05-09 14:48:59 +0000
commit03956df17f7f2efc3474c3ca29ea64475e5348b2 (patch)
tree725e95808a029f9e231488db5ba33768c60c5053 /doc
parentc21f38bc009d1517b1b917603919bb23f3802b2a (diff)
downloadscummvm-rg350-03956df17f7f2efc3474c3ca29ea64475e5348b2.tar.gz
scummvm-rg350-03956df17f7f2efc3474c3ca29ea64475e5348b2.tar.bz2
scummvm-rg350-03956df17f7f2efc3474c3ca29ea64475e5348b2.zip
Add warning for unresolved conflicts
svn-id: r13823
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions