Stanislav Bas 03c2e11961 Update to upstream/master. Resolve merge conflicts		2015-07-27 13:54:13 +03:00
..
connector.cpp
connector.hpp
setting.cpp
setting.hpp
support.hpp
usersettings.cpp	Update to upstream/master. Resolve merge conflicts	2015-07-27 13:54:13 +03:00
usersettings.hpp