From: Bdale Garbee <bdale@gag.com>
Date: Sun, 10 Nov 2013 18:48:17 +0000 (-0800)
Subject: Merge branch 'debian' into wheezy
X-Git-Tag: debian/13.11.1_bpo60+1
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=8a6066ffd8700311219e42ad7038f823abe4d184;p=debian%2Fopenrocket

Merge branch 'debian' into wheezy

Conflicts:
	debian/changelog
---

8a6066ffd8700311219e42ad7038f823abe4d184
diff --cc debian/changelog
index d1f07c58,d4c1bc24..06c23b7c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,21 @@@
++openrocket (13.11.1~bpo60+1) wheezy-backports; urgency=low
++
++  * new upstream version released, update package to trigger user updates
++
++ -- Bdale Garbee <bdale@gag.com>  Sun, 10 Nov 2013 10:44:55 -0800
++
+ openrocket (13.11.1) unstable; urgency=low
+ 
+   * new upstream version released, update package to trigger user updates
+ 
+  -- Bdale Garbee <bdale@gag.com>  Sun, 10 Nov 2013 10:21:26 -0800
+ 
 +openrocket (13.09.1~bpo60+1) wheezy-backports; urgency=low
 +
 +  * new upstream version released, update package to trigger user updates
 +
 + -- Bdale Garbee <bdale@gag.com>  Sun, 08 Sep 2013 15:07:25 -0600
 +
  openrocket (13.09.1) unstable; urgency=low
  
    * new upstream version released, update package to trigger user updates
diff --cc debian/gbp.conf
index 00000000,88406753..191c3a52
mode 000000,100644..100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@@ -1,0 -1,2 +1,2 @@@
+ [DEFAULT]
 -debian-branch = debian
++debian-branch = wheezy