Erik Karlsson 5a7118a88b Merging in master		2015-03-09 22:00:58 +01:00
..
core	Merging in master	2015-03-09 22:00:58 +01:00
core.hpp	Merge pull request #3679 from mshabunin:remove-algorithm-factory	2015-02-19 18:43:58 +00:00