[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 23:35:33
Message-ID: 20110331233533.BF962A60B0 () git ! kde ! org
[Download RAW message or body]
Git commit 1023ccb78a8881b2c843d462f497e060935107e0 by Nicolás Alvarez.
Committed on 01/04/2011 at 01:21.
Pushed by nalvarez into branch 'global-merges'.
Global branches in kstars.
May still need some work...
M +25 -0 kdeedu/kstars-parentmap
M +2 -0 kdeedu/kstars-rules
http://commits.kde.org/kde-ruleset/1023ccb78a8881b2c843d462f497e060935107e0
diff --git a/kdeedu/kstars-parentmap b/kdeedu/kstars-parentmap
index 7e7c991..4b30bdb 100644
--- a/kdeedu/kstars-parentmap
+++ b/kdeedu/kstars-parentmap
@@ -11,3 +11,28 @@
clear 699589
699453 699589
699409 699589
+
+# merge of qdbus-api-changes into trunk
+575413 575653
+
+# merge kde-kaction-cleanup1 branch into trunk
+610257 610651
+
+# intermediate merges from trunk to kde-kaction-cleanup3
+617811 618565
+619189 620435
+620757 620908
+
+# merge kde-kaction-cleanup3 branch into trunk
+# XXX I think kstars was independently ported to the new kaction API,
+# so the branch wasn't merged.
+# 621487 621549
+
+# intermediate merge from trunk into kde-kinstance-redesign branch
+627961 628271
+
+# merge kinstance-redesign branch into trunk
+628271 628316
+
+# merge kconfiggroup_port branch into trunk
+633602 635473
diff --git a/kdeedu/kstars-rules b/kdeedu/kstars-rules
index baab4bb..58d1d53 100644
--- a/kdeedu/kstars-rules
+++ b/kdeedu/kstars-rules
@@ -3,8 +3,10 @@ create repository kstars
end repository
declare MODULE=kdeedu/kstars
+declare MODULE_RECURSE=(kdeedu/)?
declare REPO=kstars
include common-kdeedu-rules
+include feature-branches
# ignore big-ass file that should have never been in the repo
match /trunk/KDE/kdeedu/kstars/kstars/data/deepstars.dat
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic