Merge commit 'refs/top-bases/i/basis-merge' into i/basis-merge

diff --git a/.topdeps b/.topdeps
index 374fc55a7596ef68f9fd86ed3e294587d9e28502..cac0c212af33dd762e8248bb5ebf8bbd0385ed50 100644 (file)
--- a/.topdeps
+++ b/.topdeps
@@ -1 +1,2 @@
-debian/locations
+i/build
+features/vim-modelines

diff --git a/.topmsg b/.topmsg
index c7f4546b0a4e36881267878fd7f682d4e89e0fda..381f6b564f2b1c39f4d239eea09beaaee09ab0e2 100644 (file)
--- a/.topmsg
+++ b/.topmsg
@@ -1,6 +1,6 @@
 From: Ian Jackson <ijackson@chiark.greenend.org.uk>
-Subject: [PATCH] Make buildable directly with debian/rules build, binary
+Subject: [PATCH] EMPTY - BASIS MERGE
 
-Remove all use of quilt.
+Empty patch for merge of included topic branches, only.
 
 Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>