Merge branch 'master' into 303

Conflicts:
	src/game/MovementHandler.cpp
This commit is contained in:
tomrus88 2008-12-13 23:16:44 +03:00
commit 4f55ef857a
7 changed files with 41 additions and 16 deletions

View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__
#define __REVISION_NR_H__
#define REVISION_NR "6902"
#define REVISION_NR "6905"
#endif // __REVISION_NR_H__