Merged default into lightmap_optimizer_port_to_linux

--HG--
branch : lightmap_optimizer_port_to_linux
This commit is contained in:
liria 2014-01-25 13:52:12 +01:00
commit a6d9521ae6

View file

@ -29,7 +29,7 @@ using namespace std;
#ifndef NL_DONT_USE_EXTERNAL_CODE
#include <freetype/freetype.h>
#include <freetype.h>
// for freetype 2.0
#ifdef FTERRORS_H
@ -51,7 +51,7 @@ int err_code;
const char* err_msg;
} ft_errors[] =
#include <freetype/fterrors.h>
#include <fterrors.h>
using namespace NLMISC;