From d6d9ff51b26d671acd9d8473d523a1be484b740e Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Thu, 2 Apr 2015 12:30:39 +0200
Subject: [ticket/13738] Use new branch names in sami-all.conf.php.

PHPBB3-13738
---
 build/sami-all.conf.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/build/sami-all.conf.php b/build/sami-all.conf.php
index 68350fee8f..fb1a269206 100644
--- a/build/sami-all.conf.php
+++ b/build/sami-all.conf.php
@@ -18,13 +18,13 @@ $config['versions'] = Sami\Version\GitVersionCollection::create(__DIR__ . '/../'
 	This would be nice, but currently causes various problems that need
 	debugging.
 	->addFromTags('release-3.0.*')
-	->add('develop-olympus', '3.0-next (olympus)')
+	->add('3.0.x', '3.0-next (olympus)')
 	->addFromTags('release-3.1.*')
-	->add('develop-ascraeus', '3.1-next (ascraeus)')
-	->add('develop')
+	->add('3.1.x', '3.1-next (ascraeus)')
+	->add('master')
 	*/
-	->add('develop-olympus')
-	->add('develop-ascraeus')
+	->add('3.0.x')
+	->add('3.1.x')
 ;
 
 return new Sami\Sami($iterator, $config);
-- 
cgit v1.2.1