mirror of
https://github.com/mangosfour/server.git
synced 2025-12-28 13:37:13 +00:00
Merge commit 'origin/master' into 310
This commit is contained in:
commit
fdba3188d1
17 changed files with 115 additions and 10 deletions
|
|
@ -31,9 +31,9 @@
|
|||
//# include <stdlib.h>
|
||||
//# include <crtdbg.h>
|
||||
#else
|
||||
# define _CRTDBG_MAP_ALLOC
|
||||
# include <stdlib.h>
|
||||
# include <crtdbg.h>
|
||||
//# define _CRTDBG_MAP_ALLOC
|
||||
//# include <stdlib.h>
|
||||
//# include <crtdbg.h>
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#ifndef __REVISION_NR_H__
|
||||
#define __REVISION_NR_H__
|
||||
#define REVISION_NR "7812"
|
||||
#define REVISION_NR "7814"
|
||||
#endif // __REVISION_NR_H__
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue