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

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

kturtle global branches

A  +8    -0    kdeedu/kturtle-parentmap         [License: UNKNOWN]  *
M  +3    -0    kdeedu/kturtle-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/a5d6c54788f14f22d83b6596bb8372802a0f43fa

diff --git a/kdeedu/kturtle-parentmap b/kdeedu/kturtle-parentmap
new file mode 100644
index 0000000..ab9df22
--- /dev/null
+++ b/kdeedu/kturtle-parentmap
@@ -0,0 +1,8 @@
+# merge kde-kaction-cleanup3 branch into trunk
+621445 621518
+
+# merge kde-kinstance-redesign branch into trunk
+627918 628316
+
+# merge kconfiggroup_port branch into trunk
+633602 635473
diff --git a/kdeedu/kturtle-rules b/kdeedu/kturtle-rules
index 22ff4f7..03d7524 100644
--- a/kdeedu/kturtle-rules
+++ b/kdeedu/kturtle-rules
@@ -3,9 +3,12 @@ create repository kturtle
 end repository
 
 declare MODULE=kdeedu/kturtle
+declare MODULE_RECURSE=(kdeedu/)?
 declare REPO=kturtle
 include common-kdeedu-rules
 
+include feature-branches
+
 # Ensure the deletion in r475469 is converted as a deletion of all contents,
 # rather than a deletion of the branch ref.
 # *This doesn't actually work fully*; it leaves files in the root.