Jamie Newbon 1c9bb4ad78 #4937 Merge branch 'statico-icons' of https://github.com/statico/synergy into statico-statico-icons ... # Conflicts: # src/gui/res/Synergy.qrc # src/gui/res/icons/256x256/synergy.ico # src/gui/res/mac/Synergy.icns # src/gui/src/MainWindow.cpp		2020-01-11 14:57:44 +00:00
..
Info.plist	v1.8.8-rc1	2017-01-31 12:39:18 +00:00
QSynergy.icns	Revert "moved gui into main subfolder #4168"	2015-02-05 11:44:23 +00:00
Synergy.icns	Add macOS folder to dist	2017-02-10 13:47:59 +00:00