[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.DBFBAA60B0 () git ! kde ! org
[Download RAW message or body]

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

Global branches in blinken.

A  +2    -0    kdeedu/blinken-parentmap         [License: UNKNOWN]  *
M  +2    -0    kdeedu/blinken-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/d72422d5c0064ca71a5b346b9b75e3db1ecf7762

diff --git a/kdeedu/blinken-parentmap b/kdeedu/blinken-parentmap
new file mode 100644
index 0000000..1378291
--- /dev/null
+++ b/kdeedu/blinken-parentmap
@@ -0,0 +1,2 @@
+# merge kde-kinstance-redesign branch into trunk
+627859 628316
diff --git a/kdeedu/blinken-rules b/kdeedu/blinken-rules
index b9e7efd..d1b58c7 100644
--- a/kdeedu/blinken-rules
+++ b/kdeedu/blinken-rules
@@ -3,8 +3,10 @@ create repository blinken
 end repository
 
 declare MODULE=kdeedu/blinken
+declare MODULE_RECURSE=(kdeedu/)?
 declare REPO=blinken
 include common-kdeedu-rules
+include feature-branches
 
 #	------< trunk/KDE/kdeedu/blinken >------
 #	[ Move/Replace: /trunk/KDE/kdeedu/blinken @ 450941 <- \
/branches/KDE/3.5/kdeedu/blinken @ 450940 ]


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