aboutsummaryrefslogtreecommitdiff
path: root/.bzr-builddeb
diff options
context:
space:
mode:
authorKen VanDine <ken.vandine@canonical.com>2009-12-10 10:50:35 -0500
committerKen VanDine <ken.vandine@canonical.com>2009-12-10 10:50:35 -0500
commitad1ff9891807b89d3722edaae7de0069aee92bde (patch)
treea5dbcb2ce060e4f67e71cad671a132542c73f101 /.bzr-builddeb
parent7f417502dd3d77cd72cfe23d0047018bf8588773 (diff)
downloadayatana-indicator-session-ad1ff9891807b89d3722edaae7de0069aee92bde.tar.gz
ayatana-indicator-session-ad1ff9891807b89d3722edaae7de0069aee92bde.tar.bz2
ayatana-indicator-session-ad1ff9891807b89d3722edaae7de0069aee92bde.zip
removed 03_tp_glib.patch and 99_autoreconf.patch, applied upstream
Diffstat (limited to '.bzr-builddeb')
-rw-r--r--.bzr-builddeb/default.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/.bzr-builddeb/default.conf b/.bzr-builddeb/default.conf
index 3165e05..36c28f8 100644
--- a/.bzr-builddeb/default.conf
+++ b/.bzr-builddeb/default.conf
@@ -1,2 +1,2 @@
[BUILDDEB]
-merge = True
+merge = False