Merge commit 'origin/master' into 320

Browse source

Conflicts:
	src/game/Player.cpp

...

This commit is contained in:

tomrus88 2009-08-27 01:54:04 +04:00

parent af8ec3d94f 3c22e14e53

commit 3882772658

42 changed files with 696 additions and 487 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

508

src/game/SpellEffects.cpp

View file

File diff suppressed because it is too large Load diff