mirror of
https://github.com/mangosfour/server.git
synced 2025-12-27 10:37:02 +00:00
Merge branch 'master' into 310
This commit is contained in:
commit
4236f7c75c
21 changed files with 173 additions and 98 deletions
|
|
@ -1,4 +1,4 @@
|
|||
#ifndef __REVISION_NR_H__
|
||||
#define __REVISION_NR_H__
|
||||
#define REVISION_NR "7948"
|
||||
#define REVISION_NR "7960"
|
||||
#endif // __REVISION_NR_H__
|
||||
|
|
|
|||
|
|
@ -371,7 +371,7 @@ namespace VMAP
|
|||
if(!rf)
|
||||
{
|
||||
printf("ERROR: Can't open model file in form: %s",pModelFilename.c_str());
|
||||
printf("... or form: %s",filename );
|
||||
printf("... or form: %s",filename.c_str() );
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue