[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_ktouch_globa?=
From:       Nicolás_Alvarez <nicolas.alvarez () gmail ! com>
Date:       2011-03-31 21:25:11
Message-ID: 20110331212511.2067FA60AE () git ! kde ! org
[Download RAW message or body]

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

ktouch global branches.

A  +8    -0    kdeedu/ktouch-parentmap         [License: UNKNOWN]  *
M  +3    -0    kdeedu/ktouch-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/ae1e2b395e6411701a4c564cac1a4354a88a634c

diff --git a/kdeedu/ktouch-parentmap b/kdeedu/ktouch-parentmap
new file mode 100644
index 0000000..c5ea6ad
--- /dev/null
+++ b/kdeedu/ktouch-parentmap
@@ -0,0 +1,8 @@
+# merge kde-kaction-cleanup1 branch into trunk
+610257 610651
+
+# merge kde-kaction-cleanup3 branch into trunk
+621347 621518
+
+# merge kconfiggroup_port branch into trunk
+634447 635473
diff --git a/kdeedu/ktouch-rules b/kdeedu/ktouch-rules
index a0577af..af76e7b 100644
--- a/kdeedu/ktouch-rules
+++ b/kdeedu/ktouch-rules
@@ -3,9 +3,12 @@ create repository ktouch
 end repository
 
 declare MODULE=kdeedu/ktouch
+declare MODULE_RECURSE=(kdeedu/)?
 declare REPO=ktouch
 include common-kdeedu-rules
 
+include feature-branches
+
 #	------< trunk/KDE/kdeedu/ktouch >------
 #	[ Parent: /trunk/KDE/kdeedu @ 409203 <- /trunk/kdeedu @ 409202 ]
 #	[ add  HEAD 409202 ]


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