Merge branch 'master' into sixel

tools/UTF-8-demo.txt

@@ -2,7 +2,7 @@
 UTF-8 encoded sample plain-text file
 ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾
 
-Markus Kuhn [ˈmaʳkʊs kuːn] <http://www.cl.cam.ac.uk/~mgk25/> — 2002-07-25
+Markus Kuhn [ˈmaʳkʊs kuːn] <http://www.cl.cam.ac.uk/~mgk25/> — 2002-07-25 CC BY
 
 
 The ASCII compatible UTF-8 encoding used in this plain-text file

tools/cmp-cvs.sh

@@ -4,7 +4,7 @@ rm diff.out
 touch diff.out
 
 for i in *.[ch]; do
-    diff -u -I'\$OpenBSD' $i ../../OpenBSD/tmux/$i >diff.tmp
+    diff -u -I'\$OpenBSD' $i /usr/src/usr.bin/tmux/$i >diff.tmp
     set -- `wc -l diff.tmp`
     [ $1 -eq 8 ] && continue
     echo $i