From kde-commits  Thu Mar 31 21:25:11 2011
From: =?utf-8?q?Nicol=C3=A1s_Alvarez?= <nicolas.alvarez () gmail ! com>
Date: Thu, 31 Mar 2011 21:25:11 +0000
To: kde-commits
Subject: =?utf-8?q?=5Bkde-ruleset/global-merges=5D_kdeedu=3A_khangman_glo?=
Message-Id: <20110331212511.2316CA60B0 () git ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=130160675101751

Git commit 9bfdbd3f7382da3289db39afc2b0dc2ba3de2002 by Nicolás Alvarez.
Committed on 31/03/2011 at 23:24.
Pushed by nalvarez into branch 'global-merges'.

khangman global branches

M  +9    -0    kdeedu/khangman-parentmap     
M  +3    -0    kdeedu/khangman-rules     

http://commits.kde.org/kde-ruleset/9bfdbd3f7382da3289db39afc2b0dc2ba3de2002

diff --git a/kdeedu/khangman-parentmap b/kdeedu/khangman-parentmap
index 0b0de82..e6de69a 100644
--- a/kdeedu/khangman-parentmap
+++ b/kdeedu/khangman-parentmap
@@ -1,2 +1,11 @@
 # merge of make_kdeedu_cool branch into trunk
 305053 305055
+
+# merge kde-kaction-cleanup3 branch into trunk
+621470 621518
+
+# merge kde-kinstance-redesign branch into trunk
+627859 628316
+
+# merge kconfiggroup_port branch into trunk
+634471 635473
diff --git a/kdeedu/khangman-rules b/kdeedu/khangman-rules
index 74f8097..5966682 100644
--- a/kdeedu/khangman-rules
+++ b/kdeedu/khangman-rules
@@ -3,9 +3,12 @@ create repository khangman
 end repository
 
 declare MODULE=kdeedu/khangman
+declare MODULE_RECURSE=(kdeedu/)?
 declare REPO=khangman
 include common-kdeedu-rules
 
+include feature-branches
+
 #	------< trunk/KDE/kdeedu/khangman >------
 #	[ Parent: /trunk/KDE/kdeedu @ 409203 <- /trunk/kdeedu @ 409202 ]
 #	[ add  HEAD 409202 ]