summaryrefslogtreecommitdiff
path: root/NEWS
diff options
context:
space:
mode:
authorBoris Faure <billiob@gmail.com>2019-10-17 00:11:13 +0200
committerBoris Faure <billiob@gmail.com>2019-10-17 00:11:13 +0200
commit688a45dc150e295a084b86d17d59dcd30ca54205 (patch)
tree92e91ea63b4ed5bbf49ea08287efa72d8ebfe89c /NEWS
parent951b415cd99838066a45ebd44c5cfa28828294e2 (diff)
parentfd2212afd8d98c39ff8ad25d86c55557209a2a5f (diff)
Merge branch 'terminology-1.5'
Conflicts: src/bin/options_font.c
Diffstat (limited to 'NEWS')
0 files changed, 0 insertions, 0 deletions