[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_kbruch_globa?=
From: Nicolás_Alvarez <nicolas.alvarez () gmail ! com>
Date: 2011-03-31 21:54:10
Message-ID: 20110331215410.36BB5A60B0 () git ! kde ! org
[Download RAW message or body]
Git commit 32f38d9669548b3577082284f5b13bd78ffbf334 by Nicolás Alvarez.
Committed on 31/03/2011 at 23:46.
Pushed by nalvarez into branch 'global-merges'.
kbruch global branches
A +8 -0 kdeedu/kbruch-parentmap [License: UNKNOWN] *
M +3 -0 kdeedu/kbruch-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/32f38d9669548b3577082284f5b13bd78ffbf334
diff --git a/kdeedu/kbruch-parentmap b/kdeedu/kbruch-parentmap
new file mode 100644
index 0000000..8704efa
--- /dev/null
+++ b/kdeedu/kbruch-parentmap
@@ -0,0 +1,8 @@
+# merge kde-kaction-cleanup1 branch into trunk
+610257 610651
+
+# intermediate merges from trunk to kde-kaction-cleanup3
+619189 620435
+
+# merge kde-kaction-cleanup3 branch into trunk
+621460 621518
diff --git a/kdeedu/kbruch-rules b/kdeedu/kbruch-rules
index d4ebad5..e3f7e2c 100644
--- a/kdeedu/kbruch-rules
+++ b/kdeedu/kbruch-rules
@@ -3,9 +3,12 @@ create repository kbruch
end repository
declare MODULE=kdeedu/kbruch
+declare MODULE_RECURSE=(kdeedu/)?
declare REPO=kbruch
include common-kdeedu-rules
+include feature-branches
+
# ------< trunk/KDE/kdeedu/kbruch >------
# [ Parent: /trunk/KDE/kdeedu @ 409203 <- /trunk/kdeedu @ 409202 ]
# [ add HEAD 409202 ]
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic