Mercurial > hg > Members > kono > Cerium

diff TaskManager/Makefile.def @ 695:cbcf0182635e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
TaskArray on going...
author Shinji KONO <kono@ie.u-ryukyu.ac.jp>
date Sat, 12 Dec 2009 17:38:30 +0900
parents be44ada665e9
children e4d2b823903c
line wrap: on
line diff
--- a/TaskManager/Makefile.def	Thu Dec 10 22:55:55 2009 +0900
+++ b/TaskManager/Makefile.def	Sat Dec 12 17:38:30 2009 +0900
@@ -32,11 +32,7 @@
 SIMPLE_TASK=-DSIMPLE_TASK
 # SIMPLE_TASK=
 
-<<<<<<< local
 # OPT = -O9 
-=======
-#OPT = -O9 
->>>>>>> other
 OPT =  -g
 
 CC     = g++