Mercurial > hg > Members > kono > Cerium

diff TaskManager/ChangeLog @ 321:f64d75473f95

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge 317
author Shinji KONO <kono@ie.u-ryukyu.ac.jp>
date Wed, 10 Jun 2009 15:23:25 +0900
parents 776c125af0b2
children b89ba1d96fff
line wrap: on
line diff
--- a/TaskManager/ChangeLog	Wed Jun 10 15:12:39 2009 +0900
+++ b/TaskManager/ChangeLog	Wed Jun 10 15:23:25 2009 +0900
@@ -1,9 +1,3 @@
-<<<<<<< local
-=======
-2009-06-10  Shinji KONO  <kono@ie.u-ryukyu.ac.jp>
-
-	add light (incomplete)
-
 2009-06-8  Shinji KONO  <kono@ie.u-ryukyu.ac.jp>
 
 	SchedTask/SchedTaskImpl の分離はあんまり意味がなかった。
@@ -24,7 +18,6 @@
 
 	post で、PPE task を渡せると良い。address は parameterとして送る
 
->>>>>>> other
 2009-02-13  Wataru MIYAGUNI  <gongo@cr.ie.u-ryukyu.ac.jp>
 
 	* kernel/ppe/Random.cc (reset): fix