chiark / gitweb /
Merge commit 'refs/top-bases/i/basis-merge' into i/basis-merge i/basis-merge i/new-update
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Wed, 28 Dec 2011 02:06:24 +0000 (02:06 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Wed, 28 Dec 2011 02:06:24 +0000 (02:06 +0000)
.topdeps
.topmsg

index 374fc55..2627f98 100644 (file)
--- a/.topdeps
+++ b/.topdeps
@@ -1 +1,7 @@
-debian/locations
+i/build
+features/vim-modelines
+fixes/ensure-worktree
+fixes/export--b-deps
+fixes/independent-help
+fixes/more-help
+fixes/tg--r-require-arg
diff --git a/.topmsg b/.topmsg
index c7f4546..381f6b5 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>