aboutsummaryrefslogtreecommitdiff
path: root/config.guess
diff options
context:
space:
mode:
authorJohannes Schickel2011-02-16 00:14:37 +0100
committerJohannes Schickel2011-02-16 00:14:37 +0100
commit7d0f5c9f1cb089c0d1f89989655a640b3e837840 (patch)
tree5cd3f94eb723cc65912cdde633c0dd10738908af /config.guess
parent46c5732ba54be263019f59a98d3ea7a2118e60a4 (diff)
parent12fd50929533a5ba1ea26ccc1e5de0b5c3f83f50 (diff)
downloadscummvm-rg350-7d0f5c9f1cb089c0d1f89989655a640b3e837840.tar.gz
scummvm-rg350-7d0f5c9f1cb089c0d1f89989655a640b3e837840.tar.bz2
scummvm-rg350-7d0f5c9f1cb089c0d1f89989655a640b3e837840.zip
Merge branch 'master' into osystem-palette
Conflicts: engines/sky/screen.h
Diffstat (limited to 'config.guess')
0 files changed, 0 insertions, 0 deletions