From kde-commits  Thu Mar 31 22:07:52 2011
From: =?utf-8?q?Nicol=C3=A1s_Alvarez?= <nicolas.alvarez () gmail ! com>
Date: Thu, 31 Mar 2011 22:07:52 +0000
To: kde-commits
Subject: =?utf-8?q?=5Bkde-ruleset/global-merges=5D_kdeedu=3A_kwordquiz_gl?=
Message-Id: <20110331220752.04B10A609B () git ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=130160931204525

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

kwordquiz global branches.

A  +8    -0    kdeedu/kwordquiz-parentmap         [License: UNKNOWN]  *
M  +3    -0    kdeedu/kwordquiz-rules     

The files marked with a * at the end have a non valid license. Please read: http://techbase.kde.org/Policies/Licensing_Policy and use the headers which are listed at that page.


http://commits.kde.org/kde-ruleset/0296349b88990ce002d751b5d265246c1709dc57

diff --git a/kdeedu/kwordquiz-parentmap b/kdeedu/kwordquiz-parentmap
new file mode 100644
index 0000000..8f26986
--- /dev/null
+++ b/kdeedu/kwordquiz-parentmap
@@ -0,0 +1,8 @@
+# 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
diff --git a/kdeedu/kwordquiz-rules b/kdeedu/kwordquiz-rules
index 5510e75..e75774c 100644
--- a/kdeedu/kwordquiz-rules
+++ b/kdeedu/kwordquiz-rules
@@ -3,9 +3,12 @@ create repository kwordquiz
 end repository
 
 declare MODULE=kdeedu/kwordquiz
+declare MODULE_RECURSE=(kdeedu/)?
 declare REPO=kwordquiz
 include common-kdeedu-rules
 
+include feature-branches
+
 #	------< trunk/KDE/kdeedu/kwordquiz >------
 #	[ Parent: /trunk/KDE/kdeedu @ 409203 <- /trunk/kdeedu @ 409202 ]
 #	[ add  HEAD 409202 ]