HardenedBSD/src 34ab832 — contrib/binutils Makefile.in, contrib/terminus ter-u32n.bdf ter-u32b.bdf
Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi Conflicts: Makefile.inc1 (unresolved) share/man/man5/src.conf.5 (unresolved) targets/pseudo/bootstrap-tools/Makefile (unresolved) tools/build/options/WITH_OFED_EXTRA (deleted)
Delta | File | |
---|---|---|
+71,590 | -432 | tools/tools/locale/etc/final-maps/widths.txt |
+52,834 | -0 | contrib/terminus/ter-u32n.bdf |
+52,834 | -0 | contrib/terminus/ter-u32b.bdf |
+0 | -49,485 | contrib/binutils/Makefile.in |
+47,418 | -0 | contrib/terminus/ter-u28b.bdf |
+47,418 | -0 | contrib/terminus/ter-u28n.bdf |
+272,094 | -49,917 | 25,491 files not shown |
+3,013,181 | -3,285,385 | 25,497 files |