Merge branch 'pr-jpmcmu-macosx-sticky-key-fix'

This commit is contained in:
XinyuHou
2015-05-06 13:20:54 +01:00
4 changed files with 42 additions and 0 deletions

1
.gitignore vendored
View File

@@ -15,3 +15,4 @@ src/gui/gui.pro.user*
src/gui/.qmake.stash
src/gui/.rnd
src/setup/win32/synergy.suo
*.smbdelete*