1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-26 03:52:01 +02:00
AlexVinS 505e53c17d Merge remote-tracking branch 'remotes/origin/develop' into SpellsRefactoring8
# Conflicts:
#	client/battle/CBattleInterface.cpp
#	lib/spells/BattleSpellMechanics.cpp
2016-09-12 10:13:40 +03:00
..
2016-09-10 09:37:18 +03:00
2016-01-31 18:01:58 +03:00
2015-02-26 20:59:18 +03:00
2015-02-26 20:59:18 +03:00