[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    =?utf-8?q?=5Bkde-ruleset/global-merges=5D_kdeedu=3A_Global_branc?=
From:       Nicolás_Alvarez <nicolas.alvarez () gmail ! com>
Date:       2011-03-31 20:15:41
Message-ID: 20110331201541.D2C9FA60AE () git ! kde ! org
[Download RAW message or body]

Git commit 91299f53e802eded7f841c4434cef3088a3b4253 by Nicolás Alvarez.
Committed on 31/03/2011 at 22:02.
Pushed by nalvarez into branch 'global-merges'.

Global branches in kig.

M  +23   -0    kdeedu/kig-parentmap     
M  +2    -0    kdeedu/kig-rules     

http://commits.kde.org/kde-ruleset/91299f53e802eded7f841c4434cef3088a3b4253

diff --git a/kdeedu/kig-parentmap b/kdeedu/kig-parentmap
index 247e1bc..d3692d9 100644
--- a/kdeedu/kig-parentmap
+++ b/kdeedu/kig-parentmap
@@ -1 +1,24 @@
+# merge make_kdeedu_cool into trunk
 217425 217432
+
+# merge kde-kaction-cleanup1 branch into trunk
+610257 610651
+
+# intermediate merges from trunk to kde-kaction-cleanup3
+619414 620435
+
+# merge kde-kaction-cleanup3 branch into trunk
+621470 621518
+
+# there is a merge from trunk into kinstance-redesign
+# but it's kinda confusing, so I'll leave it out
+
+# merge kinstance-redesign branch into trunk
+628271 628316
+
+# merge kconfiggroup_port branch into trunk
+634447 635473
+
+# merge kconfig_new_take3 into trunk
+728440 728852
+
diff --git a/kdeedu/kig-rules b/kdeedu/kig-rules
index 37dd8dd..d6e957c 100644
--- a/kdeedu/kig-rules
+++ b/kdeedu/kig-rules
@@ -3,6 +3,7 @@ create repository kig
 end repository
 
 declare MODULE=kdeedu/kig
+declare MODULE_RECURSE=(kdeedu/)?
 declare REPO=kig
 
 match /branches/kig/(post-kde-3\.5)/(kig)/
@@ -19,6 +20,7 @@ match /tags/KIG_0_1/kdeedu/kig/
 end match
 
 include common-kdeedu-rules
+include feature-branches
 
 #	------< trunk/KDE/kdeedu/kig >------
 #	[ Parent: /trunk/KDE/kdeedu @ 409203 <- /trunk/kdeedu @ 409202 ]


[prev in list] [next in list] [prev in thread] [next in thread]