Merge pull request #65 from devin-c/avoid_conflicts

Avoid conflicts with unpatched Terminus

Terminus/BDF/fonts.dir

@@ -1,19 +1,19 @@
 18
-ter-x12b.bdf -xos4-terminesspowerline-bold-r-normal--12-120-72-72-c-60-iso10646-1
-ter-x12n.bdf -xos4-terminesspowerline-medium-r-normal--12-120-72-72-c-60-iso10646-1
-ter-x14b.bdf -xos4-terminesspowerline-bold-r-normal--14-140-72-72-c-80-iso10646-1
-ter-x14n.bdf -xos4-terminesspowerline-medium-r-normal--14-140-72-72-c-80-iso10646-1
-ter-x16b.bdf -xos4-terminesspowerline-bold-r-normal--16-160-72-72-c-80-iso10646-1
-ter-x16n.bdf -xos4-terminesspowerline-medium-r-normal--16-160-72-72-c-80-iso10646-1
-ter-x18b.bdf -xos4-terminesspowerline-bold-r-normal--18-180-72-72-c-100-iso10646-1
-ter-x18n.bdf -xos4-terminesspowerline-medium-r-normal--18-180-72-72-c-100-iso10646-1
-ter-x20b.bdf -xos4-terminesspowerline-bold-r-normal--20-200-72-72-c-100-iso10646-1
-ter-x20n.bdf -xos4-terminesspowerline-medium-r-normal--20-200-72-72-c-100-iso10646-1
-ter-x22b.bdf -xos4-terminesspowerline-bold-r-normal--22-220-72-72-c-110-iso10646-1
-ter-x22n.bdf -xos4-terminesspowerline-medium-r-normal--22-220-72-72-c-110-iso10646-1
-ter-x24b.bdf -xos4-terminesspowerline-bold-r-normal--24-240-72-72-c-120-iso10646-1
-ter-x24n.bdf -xos4-terminesspowerline-medium-r-normal--24-240-72-72-c-120-iso10646-1
-ter-x28b.bdf -xos4-terminesspowerline-bold-r-normal--28-280-72-72-c-140-iso10646-1
-ter-x28n.bdf -xos4-terminesspowerline-medium-r-normal--28-280-72-72-c-140-iso10646-1
-ter-x32b.bdf -xos4-terminesspowerline-bold-r-normal--32-320-72-72-c-160-iso10646-1
-ter-x32n.bdf -xos4-terminesspowerline-medium-r-normal--32-320-72-72-c-160-iso10646-1
+ter-powerline-x12b.bdf -xos4-terminesspowerline-bold-r-normal--12-120-72-72-c-60-iso10646-1
+ter-powerline-x12n.bdf -xos4-terminesspowerline-medium-r-normal--12-120-72-72-c-60-iso10646-1
+ter-powerline-x14b.bdf -xos4-terminesspowerline-bold-r-normal--14-140-72-72-c-80-iso10646-1
+ter-powerline-x14n.bdf -xos4-terminesspowerline-medium-r-normal--14-140-72-72-c-80-iso10646-1
+ter-powerline-x16b.bdf -xos4-terminesspowerline-bold-r-normal--16-160-72-72-c-80-iso10646-1
+ter-powerline-x16n.bdf -xos4-terminesspowerline-medium-r-normal--16-160-72-72-c-80-iso10646-1
+ter-powerline-x18b.bdf -xos4-terminesspowerline-bold-r-normal--18-180-72-72-c-100-iso10646-1
+ter-powerline-x18n.bdf -xos4-terminesspowerline-medium-r-normal--18-180-72-72-c-100-iso10646-1
+ter-powerline-x20b.bdf -xos4-terminesspowerline-bold-r-normal--20-200-72-72-c-100-iso10646-1
+ter-powerline-x20n.bdf -xos4-terminesspowerline-medium-r-normal--20-200-72-72-c-100-iso10646-1
+ter-powerline-x22b.bdf -xos4-terminesspowerline-bold-r-normal--22-220-72-72-c-110-iso10646-1
+ter-powerline-x22n.bdf -xos4-terminesspowerline-medium-r-normal--22-220-72-72-c-110-iso10646-1
+ter-powerline-x24b.bdf -xos4-terminesspowerline-bold-r-normal--24-240-72-72-c-120-iso10646-1
+ter-powerline-x24n.bdf -xos4-terminesspowerline-medium-r-normal--24-240-72-72-c-120-iso10646-1
+ter-powerline-x28b.bdf -xos4-terminesspowerline-bold-r-normal--28-280-72-72-c-140-iso10646-1
+ter-powerline-x28n.bdf -xos4-terminesspowerline-medium-r-normal--28-280-72-72-c-140-iso10646-1
+ter-powerline-x32b.bdf -xos4-terminesspowerline-bold-r-normal--32-320-72-72-c-160-iso10646-1
+ter-powerline-x32n.bdf -xos4-terminesspowerline-medium-r-normal--32-320-72-72-c-160-iso10646-1

Terminus/PCF/fonts.dir

@@ -1,19 +1,19 @@
 18
-ter-x12b.pcf.gz -xos4-terminesspowerline-bold-r-normal--12-120-72-72-c-60-iso10646-1
-ter-x12n.pcf.gz -xos4-terminesspowerline-medium-r-normal--12-120-72-72-c-60-iso10646-1
-ter-x14b.pcf.gz -xos4-terminesspowerline-bold-r-normal--14-140-72-72-c-80-iso10646-1
-ter-x14n.pcf.gz -xos4-terminesspowerline-medium-r-normal--14-140-72-72-c-80-iso10646-1
-ter-x16b.pcf.gz -xos4-terminesspowerline-bold-r-normal--16-160-72-72-c-80-iso10646-1
-ter-x16n.pcf.gz -xos4-terminesspowerline-medium-r-normal--16-160-72-72-c-80-iso10646-1
-ter-x18b.pcf.gz -xos4-terminesspowerline-bold-r-normal--18-180-72-72-c-100-iso10646-1
-ter-x18n.pcf.gz -xos4-terminesspowerline-medium-r-normal--18-180-72-72-c-100-iso10646-1
-ter-x20b.pcf.gz -xos4-terminesspowerline-bold-r-normal--20-200-72-72-c-100-iso10646-1
-ter-x20n.pcf.gz -xos4-terminesspowerline-medium-r-normal--20-200-72-72-c-100-iso10646-1
-ter-x22b.pcf.gz -xos4-terminesspowerline-bold-r-normal--22-220-72-72-c-110-iso10646-1
-ter-x22n.pcf.gz -xos4-terminesspowerline-medium-r-normal--22-220-72-72-c-110-iso10646-1
-ter-x24b.pcf.gz -xos4-terminesspowerline-bold-r-normal--24-240-72-72-c-120-iso10646-1
-ter-x24n.pcf.gz -xos4-terminesspowerline-medium-r-normal--24-240-72-72-c-120-iso10646-1
-ter-x28b.pcf.gz -xos4-terminesspowerline-bold-r-normal--28-280-72-72-c-140-iso10646-1
-ter-x28n.pcf.gz -xos4-terminesspowerline-medium-r-normal--28-280-72-72-c-140-iso10646-1
-ter-x32b.pcf.gz -xos4-terminesspowerline-bold-r-normal--32-320-72-72-c-160-iso10646-1
-ter-x32n.pcf.gz -xos4-terminesspowerline-medium-r-normal--32-320-72-72-c-160-iso10646-1
+ter-powerline-x12b.pcf.gz -xos4-terminesspowerline-bold-r-normal--12-120-72-72-c-60-iso10646-1
+ter-powerline-x12n.pcf.gz -xos4-terminesspowerline-medium-r-normal--12-120-72-72-c-60-iso10646-1
+ter-powerline-x14b.pcf.gz -xos4-terminesspowerline-bold-r-normal--14-140-72-72-c-80-iso10646-1
+ter-powerline-x14n.pcf.gz -xos4-terminesspowerline-medium-r-normal--14-140-72-72-c-80-iso10646-1
+ter-powerline-x16b.pcf.gz -xos4-terminesspowerline-bold-r-normal--16-160-72-72-c-80-iso10646-1
+ter-powerline-x16n.pcf.gz -xos4-terminesspowerline-medium-r-normal--16-160-72-72-c-80-iso10646-1
+ter-powerline-x18b.pcf.gz -xos4-terminesspowerline-bold-r-normal--18-180-72-72-c-100-iso10646-1
+ter-powerline-x18n.pcf.gz -xos4-terminesspowerline-medium-r-normal--18-180-72-72-c-100-iso10646-1
+ter-powerline-x20b.pcf.gz -xos4-terminesspowerline-bold-r-normal--20-200-72-72-c-100-iso10646-1
+ter-powerline-x20n.pcf.gz -xos4-terminesspowerline-medium-r-normal--20-200-72-72-c-100-iso10646-1
+ter-powerline-x22b.pcf.gz -xos4-terminesspowerline-bold-r-normal--22-220-72-72-c-110-iso10646-1
+ter-powerline-x22n.pcf.gz -xos4-terminesspowerline-medium-r-normal--22-220-72-72-c-110-iso10646-1
+ter-powerline-x24b.pcf.gz -xos4-terminesspowerline-bold-r-normal--24-240-72-72-c-120-iso10646-1
+ter-powerline-x24n.pcf.gz -xos4-terminesspowerline-medium-r-normal--24-240-72-72-c-120-iso10646-1
+ter-powerline-x28b.pcf.gz -xos4-terminesspowerline-bold-r-normal--28-280-72-72-c-140-iso10646-1
+ter-powerline-x28n.pcf.gz -xos4-terminesspowerline-medium-r-normal--28-280-72-72-c-140-iso10646-1
+ter-powerline-x32b.pcf.gz -xos4-terminesspowerline-bold-r-normal--32-320-72-72-c-160-iso10646-1
+ter-powerline-x32n.pcf.gz -xos4-terminesspowerline-medium-r-normal--32-320-72-72-c-160-iso10646-1