------------------------------------------------------------------------
r5771 | hendricks266 | 2016-06-04 21:46:43 -0700 (Sat, 04 Jun 2016) | 1 line

Revert r5658. This fixes the disappearing chaingun problem.
------------------------------------------------------------------------
r5770 | hendricks266 | 2016-06-04 21:46:40 -0700 (Sat, 04 Jun 2016) | 1 line

GL: In uploadtexture, don't assume that a non-masking texture can safely be sent to the driver without the alpha channel.
------------------------------------------------------------------------
r5769 | hendricks266 | 2016-06-04 21:46:37 -0700 (Sat, 04 Jun 2016) | 1 line

Polymer: Fix the oversight in handling tspr->extra from r5400 by setting it to zero in polymer_scansprites.
------------------------------------------------------------------------
r5768 | hendricks266 | 2016-06-04 21:46:28 -0700 (Sat, 04 Jun 2016) | 1 line

Remove trailing whitespace from anything we don't need to rebase from an upstream.
------------------------------------------------------------------------
r5767 | hendricks266 | 2016-06-04 21:46:06 -0700 (Sat, 04 Jun 2016) | 1 line

Add some preprocessor checks on the output format to the asm.
------------------------------------------------------------------------
r5766 | hendricks266 | 2016-06-04 21:46:01 -0700 (Sat, 04 Jun 2016) | 1 line

Makefile: Switch the detection order of OPTOPT flags so that i386 is checked after x86_64. This ensures full compatibility for fat OS X binaries built using ARCH="-arch i386 -arch x86_64".
------------------------------------------------------------------------
See http://svn.eduke32.com/listing.php?repname=eduke32 for more details.