diff options
| author | Teddy Wing | 2016-12-01 13:15:55 -0500 |
|---|---|---|
| committer | Teddy Wing | 2016-12-01 13:15:55 -0500 |
| commit | 1cf0b1458248b75c3270b3b6cc7edc643e810929 (patch) | |
| tree | 2f6647b2998f64011fc4efd14afa27159e5df652 /DDHotKey/DDHotKeyTextField.h | |
| parent | 7980da615060b19e52f7e0c9e97835259f2f9901 (diff) | |
| parent | d9179f9a9b18ad73ca0fafb0e0e4f289f267b68d (diff) | |
| download | Low-Battery-Yup-1cf0b1458248b75c3270b3b6cc7edc643e810929.tar.bz2 | |
Merge branch 'shortcut-config-UI'
Conflicts:
Low Battery Yup/en.lproj/MainMenu.xib
Diffstat (limited to 'DDHotKey/DDHotKeyTextField.h')
0 files changed, 0 insertions, 0 deletions