Merge branch 'master' into 310

Conflicts:
	src/game/Unit.cpp
This commit is contained in:
tomrus88 2009-04-03 21:21:40 +04:00
commit 3ad6044f72
11 changed files with 16 additions and 16 deletions

View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "7608" #define REVISION_NR "7609"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__