Merge branch 'master' into 310

Conflicts:
	src/game/Unit.cpp
This commit is contained in:
tomrus88 2009-04-04 23:25:57 +04:00
commit 2a8776e567
14 changed files with 196 additions and 125 deletions

View file

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