aboutsummaryrefslogtreecommitdiff
path: root/.bzr-builddeb
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2009-12-10 16:59:21 -0600
committerTed Gould <ted@gould.cx>2009-12-10 16:59:21 -0600
commit9ef452b99d43fc2566801cb0755651e684470361 (patch)
tree5379e07073f3ccd7803255348b105222e5a5c4df /.bzr-builddeb
parente44eaf4d1203569cb3995a9a71d2c8c4f6c8407f (diff)
parentff35c76b57fe278dcdd160995eb1157dc2c75f27 (diff)
downloadayatana-indicator-application-9ef452b99d43fc2566801cb0755651e684470361.tar.gz
ayatana-indicator-application-9ef452b99d43fc2566801cb0755651e684470361.tar.bz2
ayatana-indicator-application-9ef452b99d43fc2566801cb0755651e684470361.zip
Merging in Ken's fixes.
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..3165e05
--- /dev/null
+++ b/.bzr-builddeb/default.conf
@@ -0,0 +1,2 @@
+[BUILDDEB]
+merge = True