[SCM] Quake 3 engine branch, debian-experimental, updated. debian/1.36+svn2287-1-3-g2fa67cc

[Simon McVittie]

The following commit has been merged in the debian-experimental branch:
commit 48d23fa7a0d2dbbf249cb55999f6ba70eb9eb473
Author: Simon McVittie <smcv at debian.org>
Date:   Wed Jul 4 18:01:54 2012 +0100

    Adjust gbp.conf for experimental

diff --git a/debian/changelog b/debian/changelog
index 4db93f0..028268e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 ioquake3 (1.36+svn2287-2) UNRELEASED; urgency=low
 
+  * Adjust gbp.conf for experimental
   * Compile on Hurd, treating it like Linux and kFreeBSD (patch and testing
     by Svante Signell, closes: #679330)
 
diff --git a/debian/gbp.conf b/debian/gbp.conf
index efba884..6dcefa3 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,4 +1,4 @@
 [DEFAULT]
-debian-branch = master
-upstream-branch = upstream
+debian-branch = debian-experimental
+upstream-branch = upstream-experimental
 pristine-tar = True

-- 
Quake 3 engine