Merge commit '5d85990d5f1bc3a6456ee2c195c6615774001d3a' into zdoom-rgb666-take2

# Conflicts:
#	src/v_video.cpp
#	src/v_video.h
This commit is contained in:
Rachael Alexanderson 2016-12-23 11:41:54 -05:00
commit 6f06cac987

Diff content is not available