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_kgeography_g?=
Message-Id: <20110331215410.1FAD1A60A9 () git ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=130160848003772

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

kgeography global branches.

A  +6    -0    kdeedu/kgeography-parentmap         [License: UNKNOWN]  *
M  +3    -0    kdeedu/kgeography-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/753b32088420f4a94b2da20582435e7669d6c0fd

diff --git a/kdeedu/kgeography-parentmap b/kdeedu/kgeography-parentmap
new file mode 100644
index 0000000..1cb9be5
--- /dev/null
+++ b/kdeedu/kgeography-parentmap
@@ -0,0 +1,6 @@
+# intermediate merges from trunk to kde-kaction-cleanup3
+617509 618565
+620015 620435
+
+# merge kde-kaction-cleanup3 branch into trunk
+621362 621518
diff --git a/kdeedu/kgeography-rules b/kdeedu/kgeography-rules
index 4a62b33..284adff 100644
--- a/kdeedu/kgeography-rules
+++ b/kdeedu/kgeography-rules
@@ -3,9 +3,12 @@ create repository kgeography
 end repository
 
 declare MODULE=kdeedu/kgeography
+declare MODULE_RECURSE=(kdeedu/)?
 declare REPO=kgeography
 include common-kdeedu-rules
 
+include feature-branches
+
 #	------< trunk/KDE/kdeedu/kgeography >------
 #	[ Move/Replace: /trunk/KDE/kdeedu/kgeography @ 436037 <- /trunk/kdereview/kgeography @ 436036 ]
 #	[ Move/Replace: /trunk/kdereview/kgeography @ 430979 <- /trunk/playground/edu/kgeography @ 430978 ]