[SCM] chocolate-doom: Doom engine closely-compatible with vanilla doom branch, master, updated. upstream/1.2.1-26-gbc00fdd

[Jon Dowland]

The following commit has been merged in the master branch:
commit cf7de7b497e8e5468c3efed26a0a4d26c25768c0
Merge: 3626d530e331b830562cb64674d3c554110c6e4c 10a77da0b3d504e417ac415362551c6133651d64
Author: Jon Dowland <jmtd at debian.org>
Date:   Sun Jul 25 18:02:10 2010 +0100

    Merge commit 'upstream/1.4.0'


-- 
chocolate-doom: Doom engine closely-compatible with vanilla doom