diff options
| author | Spenser Truex <truex@equwal.com> | 2022-08-15 01:20:16 -0300 |
|---|---|---|
| committer | Spenser Truex <truex@equwal.com> | 2022-08-15 01:54:18 -0300 |
| commit | f5b5452eac468760c2972daf184f18e16f03d1ff (patch) | |
| tree | ea56c7cc8b51dfc8bc91fda72f1d9fd3717fe882 /LICENSE | |
| parent | 1455fedf563eac284eab2adabdc369b9a72774e4 (diff) | |
| parent | baa9357e96d2478baa52a3301e70ac80a229b726 (diff) | |
Merge latest suckless build into lukesmith-0.8.5
Includes the 0.8.5 version bump, which is great since many of the
patches have already been updated to here too.
Diffstat (limited to 'LICENSE')
| -rw-r--r-- | LICENSE | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -1,6 +1,10 @@ MIT/X Consortium License +<<<<<<< HEAD © 2014-2020 Hiltjo Posthuma <hiltjo at codemadness dot org> +======= +© 2014-2022 Hiltjo Posthuma <hiltjo at codemadness dot org> +>>>>>>> suckless-master © 2018 Devin J. Pohly <djpohly at gmail dot com> © 2014-2017 Quentin Rameau <quinq at fifth dot space> © 2009-2012 Aurélien APTEL <aurelien dot aptel at gmail dot com> |