aboutsummaryrefslogtreecommitdiff
path: root/.bzr-builddeb
diff options
context:
space:
mode:
authorTed Gould <ted@canonical.com>2009-03-17 11:02:30 -0500
committerTed Gould <ted@canonical.com>2009-03-17 11:02:30 -0500
commit148a7df7bd56600090c2faf4e67ccbc041ab0b32 (patch)
tree0eacd123c41bb731b1f2542103b4518b9f84360d /.bzr-builddeb
parentdab5af7f6bbfdb69e62b8378b6c8770ffe542c06 (diff)
parent78eda239bdefc57d766417d48eb46f5a844ab956 (diff)
downloadlibayatana-indicator-148a7df7bd56600090c2faf4e67ccbc041ab0b32.tar.gz
libayatana-indicator-148a7df7bd56600090c2faf4e67ccbc041ab0b32.tar.bz2
libayatana-indicator-148a7df7bd56600090c2faf4e67ccbc041ab0b32.zip
Merging in the Ubuntu packaging versions
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