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/MASShortcutMonitor.h | |
| parent | b9b1964b3f5e8a7cf6ef76fbf2d019cdad9a9063 (diff) | |
| parent | 62c142a7f5718fa1c7523d1bd6f6f22430c0329b (diff) | |
| download | MASShortcut-86eff031bf624746932073fa0df0faa9c5b96509.tar.bz2 | |
Merge branch 'master' into legacy-osx-support.
Conflicts:
CHANGES
Diffstat (limited to 'Framework/MASShortcutMonitor.h')
| -rw-r--r-- | Framework/MASShortcutMonitor.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Framework/MASShortcutMonitor.h b/Framework/MASShortcutMonitor.h index 6d7fe82..a1aaaa8 100644 --- a/Framework/MASShortcutMonitor.h +++ b/Framework/MASShortcutMonitor.h @@ -1,7 +1,7 @@ #import "MASShortcut.h" /** - @brief Executes action when a shortcut is pressed. + Executes action when a shortcut is pressed. There can only be one instance of this class, otherwise things will probably not work. (There’s a Carbon event handler inside @@ -13,7 +13,7 @@ + (instancetype) sharedMonitor; /** - @brief Register a shortcut along with an action. + Register a shortcut along with an action. Attempting to insert an already registered shortcut probably won’t work. It may burn your house or cut your fingers. You have been warned. |