summaryrefslogtreecommitdiffstats
path: root/config/APT_overlays.d
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2015-04-08 10:41:03 +0000
committerintrigeri <intrigeri@boum.org>2015-04-08 10:41:03 +0000
commit6f8ae785ab9115ec9bf2a4c43bed62c74bdaea2f (patch)
tree8ff3fda842d3f7844b60582bff3782145080bf54 /config/APT_overlays.d
parentda8d800df4931f44eff2f4528b7d46333ec90c1e (diff)
parent862a00f056c598f333836cc59325e3997df63d2c (diff)
Merge branch 'feature/8654-encode-apt-suite-in-git-with-APT-overlays-dot-d' into bugfix/9044-syslinux-on-chromebooks
Conflicts: config/APT_overlays
Diffstat (limited to 'config/APT_overlays.d')
-rw-r--r--config/APT_overlays.d/.placeholder0
-rw-r--r--config/APT_overlays.d/bugfix-9044-syslinux-on-chromebooks0
2 files changed, 0 insertions, 0 deletions
diff --git a/config/APT_overlays.d/.placeholder b/config/APT_overlays.d/.placeholder
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/config/APT_overlays.d/.placeholder
diff --git a/config/APT_overlays.d/bugfix-9044-syslinux-on-chromebooks b/config/APT_overlays.d/bugfix-9044-syslinux-on-chromebooks
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/config/APT_overlays.d/bugfix-9044-syslinux-on-chromebooks