Mercurial > hg > Members > kono > Cerium

changeset 309:8ec2f3e61ee1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
minor fix
author Shinji KONO <kono@ie.u-ryukyu.ac.jp>
date Mon, 08 Jun 2009 19:40:27 +0900
parents 2ac66db4dd11
children c59d8927c4d1
files example/many_task/Makefile.def
diffstat 1 files changed, 0 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/example/many_task/Makefile.def	Mon Jun 08 19:36:48 2009 +0900
+++ b/example/many_task/Makefile.def	Mon Jun 08 19:40:27 2009 +0900
@@ -4,11 +4,6 @@
 # ex  macosx
 #CERIUM = /Users/gongo/Source/Concurrency/Game_project/Cerium
 
-<<<<<<< local
-# ex  linux/ps3
-=======
-# ex: linux/ps3
->>>>>>> other
 CERIUM = ../../../Cerium
 
 CC      = g++