1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-30 04:30:42 +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
..
2015-09-02 18:27:56 +03:00
2016-08-30 05:13:45 +03:00
2016-09-08 21:33:47 +02:00
2015-06-22 14:24:00 +03:00
2016-08-31 11:45:37 +02:00
2016-08-31 11:45:37 +02:00
2016-08-30 08:27:01 +03:00
2015-11-11 15:44:17 +03:00
2015-11-14 03:59:16 +03:00
2016-08-30 05:46:25 +03:00
2013-03-01 21:32:26 +00:00
2012-12-01 06:30:52 +00:00
2012-12-01 06:30:52 +00:00
2016-01-31 11:13:56 +01:00
2016-01-31 11:13:56 +01:00
2011-12-13 21:35:28 +00:00
2016-02-09 11:08:20 +01:00
2012-12-01 06:30:52 +00:00