diff options
| author | Tomáš Znamenáček | 2015-01-13 13:26:24 +0100 |
|---|---|---|
| committer | Tomáš Znamenáček | 2015-01-13 13:26:24 +0100 |
| commit | 86eff031bf624746932073fa0df0faa9c5b96509 (patch) | |
| tree | f73e60acc7c6c68e2901fcffe4e5cc77124af948 /Framework/MASHotKeyTests.m | |
| parent | b9b1964b3f5e8a7cf6ef76fbf2d019cdad9a9063 (diff) | |
| parent | 62c142a7f5718fa1c7523d1bd6f6f22430c0329b (diff) | |
| download | MASShortcut-86eff031bf624746932073fa0df0faa9c5b96509.tar.bz2 | |
Merge branch 'master' into legacy-osx-support.
Conflicts:
CHANGES
Diffstat (limited to 'Framework/MASHotKeyTests.m')
0 files changed, 0 insertions, 0 deletions