David Kelly a1c211395b Merge pull request #10152 from howard-stearns/fix-sort-by-connections-friend-column ... fix sorting by pal connections-tab friends column		2017-04-06 15:43:21 -07:00
..
external
i18n
icon
resources	Merge pull request #10152 from howard-stearns/fix-sort-by-connections-friend-column	2017-04-06 15:43:21 -07:00
src	Merge pull request #10103 from vladest/master-qml-bugfixes	2017-04-06 14:22:06 -07:00
ui	Revert "Actually merge from master"	2017-03-24 17:56:48 -07:00
CMakeLists.txt	Revert "Actually merge from master"	2017-03-24 17:56:48 -07:00
interface.exe.manifest