Stanislav Bas 03c2e11961 Update to upstream/master. Resolve merge conflicts		2015-07-27 13:54:13 +03:00
..
connector.cpp	Silence -Wreorder warnings, and remove -Wno-reorder.	2015-05-21 22:46:44 -05:00
connector.hpp	Removed unneeded includes, cleaned up code, added comments	2014-05-06 21:58:50 -05:00
setting.cpp	added tooltip support to user settings UI	2014-10-16 16:22:36 +02:00
setting.hpp	added tooltip support to user settings UI	2014-10-16 16:22:36 +02:00
support.hpp	added tooltip support to user settings UI	2014-10-16 16:22:36 +02:00
usersettings.cpp	Update to upstream/master. Resolve merge conflicts	2015-07-27 13:54:13 +03:00
usersettings.hpp	name convention and spelling fixes	2014-10-16 14:24:17 +02:00