Merge with develop

--HG--
branch : compatibility-develop
hg/compatibility-develop
kervala 7 years ago
commit e234b1518f

@ -61,6 +61,10 @@
#include <list>
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
extern CContinentManager ContinentMngr;
extern NL3D::UDriver *Driver;
extern NL3D::UScene *Scene;

@ -51,6 +51,10 @@
#include "../misc.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
using namespace std;
using namespace NLMISC;

Loading…
Cancel
Save