aboutsummaryrefslogtreecommitdiff
path: root/.bzr-builddeb/default.conf
diff options
context:
space:
mode:
authorSebastien Bacher <seb128@ubuntu.com>2011-01-13 19:52:25 -0600
committerSebastien Bacher <seb128@ubuntu.com>2011-01-13 19:52:25 -0600
commit79f9e4cb1fdeae11f1d645329e39344e27b004c5 (patch)
tree4628ece4d30eb7d6ef9d65864bf27a669d6a5494 /.bzr-builddeb/default.conf
parent7c301f7d517f5df2d04cd30851bc8ec1727efcb3 (diff)
parent57fd55ea02809fd1a018ea9c1c429ff3d144a19b (diff)
downloadlibayatana-appindicator-79f9e4cb1fdeae11f1d645329e39344e27b004c5.tar.gz
libayatana-appindicator-79f9e4cb1fdeae11f1d645329e39344e27b004c5.tar.bz2
libayatana-appindicator-79f9e4cb1fdeae11f1d645329e39344e27b004c5.zip
Import upstream version 0.2.91
Diffstat (limited to '.bzr-builddeb/default.conf')
-rw-r--r--.bzr-builddeb/default.conf2
1 files changed, 0 insertions, 2 deletions
diff --git a/.bzr-builddeb/default.conf b/.bzr-builddeb/default.conf
deleted file mode 100644
index 36c28f8..0000000
--- a/.bzr-builddeb/default.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[BUILDDEB]
-merge = False