aboutsummaryrefslogtreecommitdiff
path: root/dists/pred.dic
diff options
context:
space:
mode:
authoruruk2013-09-08 12:06:43 +0200
committeruruk2013-09-08 12:06:43 +0200
commitb8d16e894c05aaec679125e25e83abf959608123 (patch)
tree217de9595d63193e1a6c5af1bd2a9656dc497b06 /dists/pred.dic
parentc0243036a293430b7872b3450735c9cc9e68930a (diff)
parent3cc438171a55d21dbbe7644dcbb2317b2b4041fb (diff)
downloadscummvm-rg350-b8d16e894c05aaec679125e25e83abf959608123.tar.gz
scummvm-rg350-b8d16e894c05aaec679125e25e83abf959608123.tar.bz2
scummvm-rg350-b8d16e894c05aaec679125e25e83abf959608123.zip
AVALANCHE: Merge branch 'avalanche' of https://github.com/urukgit/scummvm into avalanche
Conflicts: engines/avalanche/visa2.cpp
Diffstat (limited to 'dists/pred.dic')
0 files changed, 0 insertions, 0 deletions