aboutsummaryrefslogtreecommitdiff
path: root/.bzr-builddeb
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-06-03 14:35:24 -0500
committerTed Gould <ted@gould.cx>2010-06-03 14:35:24 -0500
commitd7f06e769927016173daea6ce43eef0a8f866c20 (patch)
tree6c0b5d3794455124a00fcf5e83ad8f2343fd471c /.bzr-builddeb
parent0f7ba97faf10422fd32628636c81563b04d8a6fc (diff)
parentead73d059c5a82a5d03217f88315fe80305cf085 (diff)
downloadayatana-indicator-application-d7f06e769927016173daea6ce43eef0a8f866c20.tar.gz
ayatana-indicator-application-d7f06e769927016173daea6ce43eef0a8f866c20.tar.bz2
ayatana-indicator-application-d7f06e769927016173daea6ce43eef0a8f866c20.zip
Getting some files back... where did they go.
Diffstat (limited to '.bzr-builddeb')
-rw-r--r--.bzr-builddeb/default.conf2
1 files changed, 2 insertions, 0 deletions
diff --git a/.bzr-builddeb/default.conf b/.bzr-builddeb/default.conf
new file mode 100644
index 0000000..36c28f8
--- /dev/null
+++ b/.bzr-builddeb/default.conf
@@ -0,0 +1,2 @@
+[BUILDDEB]
+merge = False