[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_Add_branch_q?=
From:       Nicolás_Alvarez <nicolas.alvarez () gmail ! com>
Date:       2011-03-31 20:15:41
Message-ID: 20110331201541.CF5ACA60A9 () git ! kde ! org
[Download RAW message or body]

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

Add branch qdbus-api-changes, and merge it properly in kmplot.

M  +9    -0    kdeedu/feature-branches     
M  +3    -0    kdeedu/kmplot-parentmap     

http://commits.kde.org/kde-ruleset/655fb5617c932964c351711caec7c4c9586d67d5

diff --git a/kdeedu/feature-branches b/kdeedu/feature-branches
index e93b37a..6d8cb86 100644
--- a/kdeedu/feature-branches
+++ b/kdeedu/feature-branches
@@ -56,4 +56,13 @@ match /branches/work/kconfig_new_take3/KDE/${MODULE}/
     max revision 730730 # branch deleted in r730731
 end match
 
+match /branches/work/kde4-qdbus-api-changes/${MODULE_RECURSE}$
+    action recurse
+end match
+match /branches/work/kde4-qdbus-api-changes/${MODULE}/
+    repository ${REPO}
+    branch qdbus-api-changes
+    max revision 575850 # branch deleted in r575851
+end match
+
 # kate: hl svn2git rules; indent-mode svn2git;
diff --git a/kdeedu/kmplot-parentmap b/kdeedu/kmplot-parentmap
index c4ab41e..31e40f9 100644
--- a/kdeedu/kmplot-parentmap
+++ b/kdeedu/kmplot-parentmap
@@ -15,3 +15,6 @@
 
 # merge of kconfig_new into trunk
 728440 728852
+
+# merge of qdbus-api-changes into trunk
+575413 575653


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