diff options
| author | Simeon Simeonov | 2020-12-29 13:36:30 +0100 |
|---|---|---|
| committer | Simeon Simeonov | 2020-12-29 13:36:30 +0100 |
| commit | ffc15cad8238b101203147d4c9da64ee8e5a05b8 (patch) | |
| tree | 5307a63bf0651e3cddac83b1736deedc9e9be4e9 | |
| parent | 7d8b47509bafaf10985ba353a9e1d8aede451ef4 (diff) | |
| parent | 8a9e0ce370cddc449513122fe119b298b7fa48ee (diff) | |
Fix CHANGELOG typo and merge
| -rw-r--r-- | CHANGELOG | 7 |
1 files changed, 4 insertions, 3 deletions
| @@ -1,4 +1,4 @@ | |||
| 1 | 2020-04-15 i3lock-extended 2.2.13a | 1 | 2020-12-29 i3lock-extended 2.2.13a |
| 2 | 2 | ||
| 3 | • Fix and sort the help (-h) string | 3 | • Fix and sort the help (-h) string |
| 4 | • Display blinking text when --count-until has passed | 4 | • Display blinking text when --count-until has passed |
| @@ -7,8 +7,9 @@ | |||
| 7 | 7 | ||
| 8 | 2020-12-11 i3lock-extended 2.2.13 | 8 | 2020-12-11 i3lock-extended 2.2.13 |
| 9 | 9 | ||
| 10 | • Sync with i3lock 2.13 • Add support for counting broken-down | 10 | • Sync with i3lock 2.13 |
| 11 | time until a specific calendar time (-C) • Update documentationa accordingly | 11 | • Add support for counting broken-down time until a specific calendar time (-C) |
| 12 | • Update documentation accordingly | ||
| 12 | 13 | ||
| 13 | 14 | ||
| 14 | 2020-04-15 i3lock-extended 1.2.12a | 15 | 2020-04-15 i3lock-extended 1.2.12a |
