David Cernat fa3baac0f3 Merge pull request #228 from OpenMW/master while resolving conflicts ... # Conflicts: # .travis.yml # CMakeLists.txt # apps/openmw/main.cpp		2017-06-18 18:16:10 +03:00
..
translation.cpp	Merge pull request #228 from OpenMW/master while resolving conflicts	2017-06-18 18:16:10 +03:00
translation.hpp	[Client] Make topic sync work with localized versions of the game	2017-05-31 14:11:16 +03:00