diff options
| author | Attila Molnar <attilamolnar@hush.com> | 2016-03-22 18:38:17 +0100 |
|---|---|---|
| committer | Attila Molnar <attilamolnar@hush.com> | 2016-03-22 18:38:17 +0100 |
| commit | e33e8bcdf8fd3e40eba6a41b43dbc48f973efb11 (patch) | |
| tree | f4354ec863992583a135190aa7a031be8c129dba /include | |
| parent | 266eb73475303ed6d48add31eec95700923e2146 (diff) | |
| parent | d47b1550edf74e1b5756d6e0ed6561559b5f5162 (diff) | |
| parent | f71fe202e54f90190f3b5562de7926eb8265f3e5 (diff) | |
Merge branches 'master+check' and 'master+namedmodes'