Merge commit 'origin/master' into 310

This commit is contained in:
VladimirMangos 2009-06-10 18:56:29 +04:00
commit 9588b43d0c
17 changed files with 448 additions and 362 deletions

View file

@ -27,7 +27,7 @@
#ifndef _VERSION
#if PLATFORM == PLATFORM_WINDOWS
# define _VERSION(REVD,REVT,REVN,REVH) "0.13.0-DEV" " (" REVD " " REVT " Revision " REVN " - " REVH ")"
# define _VERSION(REVD,REVT,REVN,REVH) "0.14.0-DEV" " (" REVD " " REVT " Revision " REVN " - " REVH ")"
#else
# define _VERSION(REVD,REVT,REVN,REVH) "@VERSION@" " (" REVD " " REVT " Revision " REVN " - " REVH ")"
#endif

View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__
#define __REVISION_NR_H__
#define REVISION_NR "7981"
#define REVISION_NR "7987"
#endif // __REVISION_NR_H__