[Pkg-gstreamer-commits] [gst-plugins-bad1.0] 01/04: Update gbp.conf again

[Sebastian Dröge]

This is an automated email from the git hooks/post-receive script.

slomo pushed a commit to branch master
in repository gst-plugins-bad1.0.

commit 8660032b771f0eaaf87136723e31866d5340fbd9
Author: Sebastian Dröge <sebastian at centricular.com>
Date:   Sat Jun 28 12:00:12 2014 +0200

    Update gbp.conf again
---
 debian/gbp.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/gbp.conf b/debian/gbp.conf
index 0d042a7..ebb3d05 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,6 +1,6 @@
 [DEFAULT]
-upstream-branch = upstream-experimental
-debian-branch = debian-experimental
+upstream-branch = upstream
+debian-branch = master
 pristine-tar = True
 upstream-tag = upstream/%(version)s
 debian-tag = debian/%(version)s

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gstreamer/gst-plugins-bad1.0.git