Merge pull request powerline#65 from devin-c/avoid_conflicts

Avoid conflicts with unpatched Terminus
em-piguet · Apr 29, 2014 · 99be848 · 99be848
2 parents 1ceb8dc + 809af88
commit 99be848
Show file tree

Hide file tree

Showing 38 changed files with 36 additions and 36 deletions.
diff --git a/Terminus/BDF/fonts.dir b/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
diff --git a/Terminus/BDF/ter-x12b.bdf → Terminus/BDF/ter-powerline-x12b.bdf b/Terminus/BDF/ter-x12b.bdf → Terminus/BDF/ter-powerline-x12b.bdf
diff --git a/Terminus/BDF/ter-x12n.bdf → Terminus/BDF/ter-powerline-x12n.bdf b/Terminus/BDF/ter-x12n.bdf → Terminus/BDF/ter-powerline-x12n.bdf
diff --git a/Terminus/BDF/ter-x14b.bdf → Terminus/BDF/ter-powerline-x14b.bdf b/Terminus/BDF/ter-x14b.bdf → Terminus/BDF/ter-powerline-x14b.bdf
diff --git a/Terminus/BDF/ter-x14n.bdf → Terminus/BDF/ter-powerline-x14n.bdf b/Terminus/BDF/ter-x14n.bdf → Terminus/BDF/ter-powerline-x14n.bdf
diff --git a/Terminus/BDF/ter-x16b.bdf → Terminus/BDF/ter-powerline-x16b.bdf b/Terminus/BDF/ter-x16b.bdf → Terminus/BDF/ter-powerline-x16b.bdf
diff --git a/Terminus/BDF/ter-x16n.bdf → Terminus/BDF/ter-powerline-x16n.bdf b/Terminus/BDF/ter-x16n.bdf → Terminus/BDF/ter-powerline-x16n.bdf
diff --git a/Terminus/BDF/ter-x18b.bdf → Terminus/BDF/ter-powerline-x18b.bdf b/Terminus/BDF/ter-x18b.bdf → Terminus/BDF/ter-powerline-x18b.bdf
diff --git a/Terminus/BDF/ter-x18n.bdf → Terminus/BDF/ter-powerline-x18n.bdf b/Terminus/BDF/ter-x18n.bdf → Terminus/BDF/ter-powerline-x18n.bdf
diff --git a/Terminus/BDF/ter-x20b.bdf → Terminus/BDF/ter-powerline-x20b.bdf b/Terminus/BDF/ter-x20b.bdf → Terminus/BDF/ter-powerline-x20b.bdf
diff --git a/Terminus/BDF/ter-x20n.bdf → Terminus/BDF/ter-powerline-x20n.bdf b/Terminus/BDF/ter-x20n.bdf → Terminus/BDF/ter-powerline-x20n.bdf
diff --git a/Terminus/BDF/ter-x22b.bdf → Terminus/BDF/ter-powerline-x22b.bdf b/Terminus/BDF/ter-x22b.bdf → Terminus/BDF/ter-powerline-x22b.bdf
diff --git a/Terminus/BDF/ter-x22n.bdf → Terminus/BDF/ter-powerline-x22n.bdf b/Terminus/BDF/ter-x22n.bdf → Terminus/BDF/ter-powerline-x22n.bdf
diff --git a/Terminus/BDF/ter-x24b.bdf → Terminus/BDF/ter-powerline-x24b.bdf b/Terminus/BDF/ter-x24b.bdf → Terminus/BDF/ter-powerline-x24b.bdf
diff --git a/Terminus/BDF/ter-x24n.bdf → Terminus/BDF/ter-powerline-x24n.bdf b/Terminus/BDF/ter-x24n.bdf → Terminus/BDF/ter-powerline-x24n.bdf
diff --git a/Terminus/BDF/ter-x28b.bdf → Terminus/BDF/ter-powerline-x28b.bdf b/Terminus/BDF/ter-x28b.bdf → Terminus/BDF/ter-powerline-x28b.bdf
diff --git a/Terminus/BDF/ter-x28n.bdf → Terminus/BDF/ter-powerline-x28n.bdf b/Terminus/BDF/ter-x28n.bdf → Terminus/BDF/ter-powerline-x28n.bdf
diff --git a/Terminus/BDF/ter-x32b.bdf → Terminus/BDF/ter-powerline-x32b.bdf b/Terminus/BDF/ter-x32b.bdf → Terminus/BDF/ter-powerline-x32b.bdf
diff --git a/Terminus/BDF/ter-x32n.bdf → Terminus/BDF/ter-powerline-x32n.bdf b/Terminus/BDF/ter-x32n.bdf → Terminus/BDF/ter-powerline-x32n.bdf
diff --git a/Terminus/PCF/fonts.dir b/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
diff --git a/Terminus/PCF/ter-x12b.pcf.gz → Terminus/PCF/ter-powerline-x12b.pcf.gz b/Terminus/PCF/ter-x12b.pcf.gz → Terminus/PCF/ter-powerline-x12b.pcf.gz
diff --git a/Terminus/PCF/ter-x12n.pcf.gz → Terminus/PCF/ter-powerline-x12n.pcf.gz b/Terminus/PCF/ter-x12n.pcf.gz → Terminus/PCF/ter-powerline-x12n.pcf.gz
diff --git a/Terminus/PCF/ter-x14b.pcf.gz → Terminus/PCF/ter-powerline-x14b.pcf.gz b/Terminus/PCF/ter-x14b.pcf.gz → Terminus/PCF/ter-powerline-x14b.pcf.gz
diff --git a/Terminus/PCF/ter-x14n.pcf.gz → Terminus/PCF/ter-powerline-x14n.pcf.gz b/Terminus/PCF/ter-x14n.pcf.gz → Terminus/PCF/ter-powerline-x14n.pcf.gz
diff --git a/Terminus/PCF/ter-x16b.pcf.gz → Terminus/PCF/ter-powerline-x16b.pcf.gz b/Terminus/PCF/ter-x16b.pcf.gz → Terminus/PCF/ter-powerline-x16b.pcf.gz
diff --git a/Terminus/PCF/ter-x16n.pcf.gz → Terminus/PCF/ter-powerline-x16n.pcf.gz b/Terminus/PCF/ter-x16n.pcf.gz → Terminus/PCF/ter-powerline-x16n.pcf.gz
diff --git a/Terminus/PCF/ter-x18b.pcf.gz → Terminus/PCF/ter-powerline-x18b.pcf.gz b/Terminus/PCF/ter-x18b.pcf.gz → Terminus/PCF/ter-powerline-x18b.pcf.gz
diff --git a/Terminus/PCF/ter-x18n.pcf.gz → Terminus/PCF/ter-powerline-x18n.pcf.gz b/Terminus/PCF/ter-x18n.pcf.gz → Terminus/PCF/ter-powerline-x18n.pcf.gz
diff --git a/Terminus/PCF/ter-x20b.pcf.gz → Terminus/PCF/ter-powerline-x20b.pcf.gz b/Terminus/PCF/ter-x20b.pcf.gz → Terminus/PCF/ter-powerline-x20b.pcf.gz
diff --git a/Terminus/PCF/ter-x20n.pcf.gz → Terminus/PCF/ter-powerline-x20n.pcf.gz b/Terminus/PCF/ter-x20n.pcf.gz → Terminus/PCF/ter-powerline-x20n.pcf.gz
diff --git a/Terminus/PCF/ter-x22b.pcf.gz → Terminus/PCF/ter-powerline-x22b.pcf.gz b/Terminus/PCF/ter-x22b.pcf.gz → Terminus/PCF/ter-powerline-x22b.pcf.gz
diff --git a/Terminus/PCF/ter-x22n.pcf.gz → Terminus/PCF/ter-powerline-x22n.pcf.gz b/Terminus/PCF/ter-x22n.pcf.gz → Terminus/PCF/ter-powerline-x22n.pcf.gz
diff --git a/Terminus/PCF/ter-x24b.pcf.gz → Terminus/PCF/ter-powerline-x24b.pcf.gz b/Terminus/PCF/ter-x24b.pcf.gz → Terminus/PCF/ter-powerline-x24b.pcf.gz
diff --git a/Terminus/PCF/ter-x24n.pcf.gz → Terminus/PCF/ter-powerline-x24n.pcf.gz b/Terminus/PCF/ter-x24n.pcf.gz → Terminus/PCF/ter-powerline-x24n.pcf.gz
diff --git a/Terminus/PCF/ter-x28b.pcf.gz → Terminus/PCF/ter-powerline-x28b.pcf.gz b/Terminus/PCF/ter-x28b.pcf.gz → Terminus/PCF/ter-powerline-x28b.pcf.gz
diff --git a/Terminus/PCF/ter-x28n.pcf.gz → Terminus/PCF/ter-powerline-x28n.pcf.gz b/Terminus/PCF/ter-x28n.pcf.gz → Terminus/PCF/ter-powerline-x28n.pcf.gz
diff --git a/Terminus/PCF/ter-x32b.pcf.gz → Terminus/PCF/ter-powerline-x32b.pcf.gz b/Terminus/PCF/ter-x32b.pcf.gz → Terminus/PCF/ter-powerline-x32b.pcf.gz
diff --git a/Terminus/PCF/ter-x32n.pcf.gz → Terminus/PCF/ter-powerline-x32n.pcf.gz b/Terminus/PCF/ter-x32n.pcf.gz → Terminus/PCF/ter-powerline-x32n.pcf.gz