From kde-commits  Thu Mar 31 23:35:33 2011
From: =?utf-8?q?Nicol=C3=A1s_Alvarez?= <nicolas.alvarez () gmail ! com>
Date: Thu, 31 Mar 2011 23:35:33 +0000
To: kde-commits
Subject: =?utf-8?q?=5Bkde-ruleset/global-merges=5D_kdeedu=3A_Convert_glob?=
Message-Id: <20110331233533.BABE9A60A9 () git ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=130161459609309

Git commit 2ed29469f16e5402ccfb4a3756d9fc0219097c61 by Nicolás Alvarez.
Committed on 01/04/2011 at 01:35.
Pushed by nalvarez into branch 'global-merges'.

Convert global branches in parley, from when it was called kvoctrain.

M  +9    -0    kdeedu/parley-parentmap     
M  +5    -1    kdeedu/parley-rules     

http://commits.kde.org/kde-ruleset/2ed29469f16e5402ccfb4a3756d9fc0219097c61

diff --git a/kdeedu/parley-parentmap b/kdeedu/parley-parentmap
index cc6653e..a9bd5e9 100644
--- a/kdeedu/parley-parentmap
+++ b/kdeedu/parley-parentmap
@@ -13,5 +13,14 @@ clear 835561
 830450 835561
 835492 835561
 
+# merge kde-kaction-cleanup1 branch into trunk
+610257 610651
+
+# merge kde-kinstance-redesign branch into trunk
+627918 628316
+
+# merge kconfiggroup_port branch into trunk
+634447 635473
+
 # merge kconfig_new_take3 into trunk
 728440 728852
diff --git a/kdeedu/parley-rules b/kdeedu/parley-rules
index 5f7922a..14fe600 100644
--- a/kdeedu/parley-rules
+++ b/kdeedu/parley-rules
@@ -12,7 +12,6 @@ match /branches/work/(kdeedu_parley|parley-practice|soc-parley)/parley/
 end match
 
 include common-kdeedu-rules
-include feature-branches
 
 #	------< trunk/KDE/kdeedu/parley >------
 #	[ Move/Replace: /trunk/KDE/kdeedu/parley @ 710186 <- /trunk/KDE/kdeedu/kvoctrain @ 710173 ]
@@ -34,6 +33,11 @@ match /trunk/(KDE/)?kdeedu/doc/kvoctrain/
     prefix doc/
 end match
 
+declare MODULE=kdeedu/kvoctrain
+include feature-branches
+declare MODULE=kdeedu/parley
+include feature-branches
+
 match /
 end match
 #First revision used: 116608