[SCM] clone of the legendary first person shooter Doom branch, master, updated. upstream/2.5.0+dfsg1-19-g1125a27

[Jon Dowland]

The following commit has been merged in the master branch:
commit 1125a2782c93d87b24a9446a34e2c9158b87e703
Author: Jon Dowland <jmtd at debian.org>
Date:   Fri Sep 3 15:50:23 2010 +0100

    disable i386 assembler: document

diff --git a/debian/changelog b/debian/changelog
index 72b9462..4a4afb5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,10 @@ prboom (2:2.5.0+dfsg1-6) unstable; urgency=low
     Thanks Moritz for your work!
   * bump standards version to 3.9.1.
   * stop using quilt for patch management (use the VCS)
+  * disable the use of i386 assembler, which causes prboom
+    to crash for unknown reasons.
 
- -- Jon Dowland <jmtd at debian.org>  Fri, 03 Sep 2010 15:42:51 +0100
+ -- Jon Dowland <jmtd at debian.org>  Fri, 03 Sep 2010 15:49:59 +0100
 
 prboom (2:2.5.0+dfsg1-5) unstable; urgency=low
 

-- 
clone of the legendary first person shooter Doom