Merge branch 'master' into floatcvt

This commit is contained in:
Christoph Oelckers 2016-03-28 22:53:26 +02:00
commit 0a238e7e18
3 changed files with 3 additions and 0 deletions

View file

@ -79,6 +79,7 @@
#include "v_palette.h"
#include "menu/menu.h"
#include "a_sharedglobal.h"
#include "a_strifeglobal.h"
#include "r_data/colormaps.h"
#include "farchive.h"
#include "r_renderer.h"