Roman Donchenko 1312eca220 Merge commit '0566ab4d3d' into merge-2.4
Conflicts:
	modules/core/src/system.cpp
2013-12-30 16:51:46 +04:00
..
2013-12-11 21:23:27 -02:00
2013-12-26 17:14:20 +04:00
2013-12-11 15:56:54 +04:00
2013-10-25 18:00:46 +04:00
2013-12-11 15:56:54 +04:00